2 files changed, 11 insertions, 14 deletions

diff --git a/etc/rc b/etc/rc
index 7d447bb37d67..5314d4749ff1 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$Id: rc,v 1.69 1995/09/14 02:44:47 jkh Exp $
+#	$Id: rc,v 1.70 1995/09/18 07:38:18 jkh Exp $
 #	From: @(#)rc	5.27 (Berkeley) 6/5/91
 
 # System startup script run by init on autoboot
@@ -226,16 +226,6 @@ if [ "X${amdflags}" != X"NO" ]; then
 	echo -n ' amd';			amd ${amdflags}
 fi
 
-# These should go elsewhere but netstart is too early and I don't
-# want to touch rc.local, so...
-if [ "X${pcnfsd}" = X"YES" -a -x /usr/local/libexec/rpc.pcnfsd ]; then
-	echo -n ' rpc.pcnfsd'; /usr/local/libexec/rpc.pcnfsd &
-fi
-
-if [ "X${apache_httpd}" = X"YES" -a -x /usr/local/www/server/httpd ]; then
-	echo -n ' apache httpd'; /usr/local/www/server/httpd &
-fi
-
 # Kerberos runs ONLY on the Kerberos server machine
 if [ "X${kerberos_server}" = X"YES" ]; then
 	echo -n ' kerberos';	kerberos >> /var/log/kerberos.log &
@@ -302,8 +292,8 @@ if [ -f /etc/rc.$arch ]; then
 	. /etc/rc.$arch
 fi
 
-if [ -d /etc/rc.local.d ]; then
-	for script in /etc/rc.local.d/*.sh; do
+if [ "X${local_startup}" != X"NO" -a -d $local_startup ]; then
+	for script in $local_startup/*.sh; do
 		[ -x $script ] && $script start
 	done
 fi
diff --git a/etc/sysconfig b/etc/sysconfig
index 6d7e6f0e26c5..d4e1460ce940 100644
--- a/etc/sysconfig
+++ b/etc/sysconfig
@@ -4,7 +4,14 @@
 # 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.21 1995/09/14 02:44:49 jkh Exp $
+#	$Id: sysconfig,v 1.22 1995/09/14 23:17:13 jkh Exp $
+
+######################### Start Of Local Configuration Section ###########
+
+# Location of local startup files.
+local_startup=/usr/local/etc
+
+######################### End Of Local Configuration Section #############
 
 ######################### Start Of Syscons Section #######################