Removed startup code for pcnfsd and apache. These don't even exist

in FreeBSD and should never have got in here.

Removed hard-coded /etc/rc.local.d hacks and implemented a more flexible
solution.

Added a local configuration area to sysconfig.
This commit is contained in:
Paul Richards 1995-09-18 19:17:14 +00:00
parent e475c1dd26
commit b1d1220363
2 changed files with 11 additions and 14 deletions

16
etc/rc
View File

@ -1,5 +1,5 @@
#!/bin/sh #!/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 # From: @(#)rc 5.27 (Berkeley) 6/5/91
# System startup script run by init on autoboot # System startup script run by init on autoboot
@ -226,16 +226,6 @@ if [ "X${amdflags}" != X"NO" ]; then
echo -n ' amd'; amd ${amdflags} echo -n ' amd'; amd ${amdflags}
fi 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 # Kerberos runs ONLY on the Kerberos server machine
if [ "X${kerberos_server}" = X"YES" ]; then if [ "X${kerberos_server}" = X"YES" ]; then
echo -n ' kerberos'; kerberos >> /var/log/kerberos.log & echo -n ' kerberos'; kerberos >> /var/log/kerberos.log &
@ -302,8 +292,8 @@ if [ -f /etc/rc.$arch ]; then
. /etc/rc.$arch . /etc/rc.$arch
fi fi
if [ -d /etc/rc.local.d ]; then if [ "X${local_startup}" != X"NO" -a -d $local_startup ]; then
for script in /etc/rc.local.d/*.sh; do for script in $local_startup/*.sh; do
[ -x $script ] && $script start [ -x $script ] && $script start
done done
fi fi

View File

@ -4,7 +4,14 @@
# This is sysconfig - a file full of useful variables that you can set # This is sysconfig - a file full of useful variables that you can set
# to change the default startup behavior of your system. # 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 ####################### ######################### Start Of Syscons Section #######################