Add ${lpd_program} and ${portmap_program} as variables in rc.conf, with

suitable defaults pointing to the FreeBSD-shipped versions.  This will allow
for easier integration of third-party replacements for these daemons.
Reviewed by: Several members of -committers

9 files changed, 19 insertions, 17 deletions

diff --git a/etc/defaults/rc.conf b/etc/defaults/rc.conf
index c4d5eeb..ca09312 100644
--- a/etc/defaults/rc.conf
+++ b/etc/defaults/rc.conf
@@ -9,7 +9,7 @@
 #
 # All arguments must be in double or single quotes.
 #
-#	$Id: rc.conf,v 1.1 1999/02/09 22:15:18 jkh Exp $
+#	$Id: rc.conf,v 1.2 1999/03/03 15:04:33 phk Exp $
 
 ##############################################################
 ### Important initial Boot-time options  #####################
@@ -81,6 +81,7 @@ nfs_reserved_port_only="NO"	# Provide NFS only on secure port (or NO).
 rpc_lockd_enable="NO"		# Run NFS rpc.lockd (*broken!*) if nfs_server.
 rpc_statd_enable="YES"		# Run NFS rpc.statd if nfs_server (or NO).
 portmap_enable="YES"		# Run the portmapper service (or NO).
+portmap_program="/usr/sbin/portmap"	# path to portmap, if you want a different one.
 portmap_flags=""		# Flags to portmap (if enabled).
 rpc_ypupdated_enable="NO"	# Run if NIS master and SecureRPC (or NO).
 keyserv_enable="NO"		# Run the SecureRPC keyserver (or NO).
@@ -178,6 +179,7 @@ allscreens_flags=""	# Set this vidcontrol mode for all virtual screens
 
 cron_enable="YES"	# Run the periodic job daemon.
 lpd_enable="NO"		# Run the line printer daemon.
+lpd_program="/usr/sbin/lpd"	# path to lpd, if you want a different one.
 lpd_flags=""		# Flags to lpd (if enabled).
 usbd_enable="NO"	# Run the usbd daemon.
 usbd_flags=""		# Flags to usbd (if enabled).
diff --git a/etc/network.subr b/etc/network.subr
index 49e936a..e54589f 100644
--- a/etc/network.subr
+++ b/etc/network.subr
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.38 1999/01/13 08:20:55 hm Exp $
+#	$Id: rc.network,v 1.39 1999/01/13 17:32:37 joerg Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -211,7 +211,7 @@ network_pass2() {
     fi
 
     if [ "X${portmap_enable}" = X"YES" ]; then
-	    echo -n ' portmap';		portmap ${portmap_flags}
+	    echo -n ' portmap';		${portmap_program} ${portmap_flags}
     fi
 
     # Start ypserv if we're an NIS server.
diff --git a/etc/rc b/etc/rc
index 1f3957b..8731a21 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$Id: rc,v 1.178 1999/02/10 18:08:16 jkh Exp $
+#	$Id: rc,v 1.179 1999/02/13 05:30:49 jkh Exp $
 #	From: @(#)rc	5.27 (Berkeley) 6/5/91
 
 # System startup script run by init on autoboot
@@ -305,7 +305,7 @@ if [ "X${cron_enable}" != X"NO" ]; then
 fi
 
 if [ "X${lpd_enable}" = X"YES" ]; then
-	echo -n ' printer';		lpd ${lpd_flags}
+	echo -n ' printer';		${lpd_program} ${lpd_flags}
 fi
 
 if [ "X${sendmail_enable}" = X"YES" -a -r /etc/sendmail.cf ]; then
diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions
index 49e936a..e54589f 100644
--- a/etc/rc.d/netoptions
+++ b/etc/rc.d/netoptions
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.38 1999/01/13 08:20:55 hm Exp $
+#	$Id: rc.network,v 1.39 1999/01/13 17:32:37 joerg Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -211,7 +211,7 @@ network_pass2() {
     fi
 
     if [ "X${portmap_enable}" = X"YES" ]; then
-	    echo -n ' portmap';		portmap ${portmap_flags}
+	    echo -n ' portmap';		${portmap_program} ${portmap_flags}
     fi
 
     # Start ypserv if we're an NIS server.
diff --git a/etc/rc.d/network1 b/etc/rc.d/network1
index 49e936a..e54589f 100644
--- a/etc/rc.d/network1
+++ b/etc/rc.d/network1
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.38 1999/01/13 08:20:55 hm Exp $
+#	$Id: rc.network,v 1.39 1999/01/13 17:32:37 joerg Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -211,7 +211,7 @@ network_pass2() {
     fi
 
     if [ "X${portmap_enable}" = X"YES" ]; then
-	    echo -n ' portmap';		portmap ${portmap_flags}
+	    echo -n ' portmap';		${portmap_program} ${portmap_flags}
     fi
 
     # Start ypserv if we're an NIS server.
diff --git a/etc/rc.d/network2 b/etc/rc.d/network2
index 49e936a..e54589f 100644
--- a/etc/rc.d/network2
+++ b/etc/rc.d/network2
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.38 1999/01/13 08:20:55 hm Exp $
+#	$Id: rc.network,v 1.39 1999/01/13 17:32:37 joerg Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -211,7 +211,7 @@ network_pass2() {
     fi
 
     if [ "X${portmap_enable}" = X"YES" ]; then
-	    echo -n ' portmap';		portmap ${portmap_flags}
+	    echo -n ' portmap';		${portmap_program} ${portmap_flags}
     fi
 
     # Start ypserv if we're an NIS server.
diff --git a/etc/rc.d/network3 b/etc/rc.d/network3
index 49e936a..e54589f 100644
--- a/etc/rc.d/network3
+++ b/etc/rc.d/network3
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.38 1999/01/13 08:20:55 hm Exp $
+#	$Id: rc.network,v 1.39 1999/01/13 17:32:37 joerg Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -211,7 +211,7 @@ network_pass2() {
     fi
 
     if [ "X${portmap_enable}" = X"YES" ]; then
-	    echo -n ' portmap';		portmap ${portmap_flags}
+	    echo -n ' portmap';		${portmap_program} ${portmap_flags}
     fi
 
     # Start ypserv if we're an NIS server.
diff --git a/etc/rc.d/routing b/etc/rc.d/routing
index 49e936a..e54589f 100644
--- a/etc/rc.d/routing
+++ b/etc/rc.d/routing
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.38 1999/01/13 08:20:55 hm Exp $
+#	$Id: rc.network,v 1.39 1999/01/13 17:32:37 joerg Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -211,7 +211,7 @@ network_pass2() {
     fi
 
     if [ "X${portmap_enable}" = X"YES" ]; then
-	    echo -n ' portmap';		portmap ${portmap_flags}
+	    echo -n ' portmap';		${portmap_program} ${portmap_flags}
     fi
 
     # Start ypserv if we're an NIS server.
diff --git a/etc/rc.network b/etc/rc.network
index 49e936a..e54589f 100644
--- a/etc/rc.network
+++ b/etc/rc.network
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.network,v 1.38 1999/01/13 08:20:55 hm Exp $
+#	$Id: rc.network,v 1.39 1999/01/13 17:32:37 joerg Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -211,7 +211,7 @@ network_pass2() {
     fi
 
     if [ "X${portmap_enable}" = X"YES" ]; then
-	    echo -n ' portmap';		portmap ${portmap_flags}
+	    echo -n ' portmap';		${portmap_program} ${portmap_flags}
     fi
 
     # Start ypserv if we're an NIS server.