Go to new scheme for local_startup variable. Now one can specify multiple

directories to check in looking for port startup scripts.  The specific gunge
for apache httpd, gated and pcnfsd in /etc/sysconfig and /etc/netstart is
gone now.  Note that pcnfsd's troubles aren't necessarily over (and probably
why NetBSD brought it into their sources) - anyone adding pcnfsd will STILL
have to tweak /etc/sysconfig in order to set the new variable
`weak_mountd_authentication' to YES.  The flags to mountd are directly affected
by pcnfsd's requirements for non-root mounts, unfortunately! :-(
Submitted by: paul & jkh

3 files changed, 22 insertions, 31 deletions

diff --git a/etc/netstart b/etc/netstart
index 9394644..7d2bd37 100755
--- a/etc/netstart
+++ b/etc/netstart
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: netstart,v 1.34 1995/08/23 07:12:15 jkh Exp $
+#	$Id: netstart,v 1.35 1995/08/25 07:18:04 davidg Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -56,21 +56,17 @@ done
 
 if [ "x$gateway" != "xNO" ]; then
 	echo 'configuring host as a gateway.'
-	sysctl -w net.inet.ip.forwarding=1
+	sysctl -w net.inet.ip.forwarding=1 >& /dev/null
 fi
 
-if [ "x$gated" != "xNO" -o "x$routedflags" != "xNO" ] ; then
-	echo -n starting routing daemons:
+if [ "x$routedflags" != "xNO" ] ; then
+	echo -n starting routing daemon:
 
-	# $gated and $routedflags are imported from /etc/sysconfig.
-	# If $gated == YES, gated is used; otherwise routed.
+	# $routedflags is imported from /etc/sysconfig.
 	# If $routedflags == NO, routed isn't run.
 
-	if [ "X${gated}" = X"YES" -a -r /etc/gated.conf ]; then
-		echo -n	' gated';	/usr/local/sbin/gated $gatedflags
-	elif [ "X${routedflags}" != X"NO" ]; then
+	if [ "X${routedflags}" != X"NO" ]; then
 		echo -n ' routed';	routed $routedflags
 	fi
-
 	echo '.'
 fi
diff --git a/etc/rc b/etc/rc
index 319dd7f..234960d 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$Id: rc,v 1.78 1995/11/04 05:03:16 pst Exp $
+#	$Id: rc,v 1.79 1995/12/09 19:40:12 ache Exp $
 #	From: @(#)rc	5.27 (Berkeley) 6/5/91
 
 # System startup script run by init on autoboot
@@ -210,7 +210,7 @@ fi
 
 if [ "X${nfs_server}" = X"YES" -a -r /etc/exports ]; then
 	echo -n ' mountd'
-	if [ "X${pcnfsd}" = X"YES" ]; then
+	if [ "X${weak_mountd_authentication}" = X"YES" ]; then
 		mountd -n
 	else
 		mountd
@@ -295,9 +295,12 @@ if [ -f /etc/rc.${arch} ]; then
 	. /etc/rc.${arch}
 fi
 
-if [ "X${local_startup}" != X"NO" -a -d ${local_startup} ]; then
-	for script in ${local_startup}/*.sh; do
-		[ -x ${script} ] && ${script} start
+# for each valid dir in $local_startup, search for init scripts matching *.sh
+if [ "X${local_startup}" != X"NO" ]; then
+	for dir in ${local_startup}; do
+		[ -d ${dir} ] && for script in ${dir}/*.sh; do
+			[ -x ${script} ] && ${script} start
+		done
 	done
 fi
 
diff --git a/etc/sysconfig b/etc/sysconfig
index 20e3bb0..51d2654 100644
--- a/etc/sysconfig
+++ b/etc/sysconfig
@@ -4,12 +4,12 @@
 # This is sysconfig - a file full of useful variables that you can set 
 # to change the default startup behavior of your system.
 #
-#	$Id: sysconfig,v 1.27 1995/10/28 12:41:40 peter Exp $
+#	$Id: sysconfig,v 1.28 1995/11/13 21:18:24 markm Exp $
 
 ######################### Start Of Local Configuration Section ###########
 
-# Location of local startup files.
-local_startup=/usr/local/etc/rc.d
+# Location of local startup directories.
+local_startup=/usr/local/etc/rc.d /usr/X11R6/etc/rc.d
 
 ######################### End Of Local Configuration Section #############
 
@@ -77,6 +77,10 @@ defaultdomainname=NO
 #
 tcp_extensions=YES
 
+# If you're running PCNFSD or anything else which requires mountd to allow
+# non-root requests for NFS mounts, set this to YES.
+weak_mountd_authentication=NO
+
 #
 # Set to the list of network devices on this host.  You must have an
 # ifconfig_${network_interface} line for each interface listed here.
@@ -150,15 +154,6 @@ yppasswddflags="NO"
 # For most hosts, flags should be "-b /etc/namedb/named.boot"
 namedflags="NO"
 
-# Set to YES if you run PC-NFSD (see /usr/ports/net/pcnfsd) for
-# sharing filesystems with DOS/Windows PCs.
-pcnfsd=NO
-
-# Set to YES if you have the Apache WEB server (see /usr/ports/net/apache)
-# installed and want to run it at system startup time (this is better than
-# running it from inetd if you're running a dedicated WWW server).
-apache_httpd=NO
-
 # Set to YES if you want to run the X-10 power controller daemon
 xtend=NO
 
@@ -177,9 +172,6 @@ kerberos_server=NO
 # If you want this host to be a gateway, set to YES.
 gateway=NO
 
-# Set to YES if you want to run gated
-gated=NO
-
 # Set to YES if you wish to check quotas.  NOTE:  For now this probably
 # doesn't work and should be left disabled.
 check_quotas=NO
@@ -195,7 +187,7 @@ accounting=NO
 # Set to YES if you want ibcs2 (SCO) emulation loaded at startup
 ibcs2=NO
 
-# Set to YES if you want Linux (a.out) emulation loaded at startup
+# Set to YES if you want Linux a.out emulation loaded at startup
 linux=NO
 
 # Set to a string representing the interrupts you are going to use