Remove sysctl's from rc.conf, there seems to be a concensus that

rc.conf should only contain simple ops.  We still keep the conf_dir
    override, however, and this will be used when rc.conf is run from
    /etc/rc in a diskless configuration.
This commit is contained in:
Matthew Dillon 1999-01-26 07:32:59 +00:00
parent 7ba9347985
commit 5bbcf5a4e0
1 changed files with 4 additions and 7 deletions

View File

@ -6,7 +6,7 @@
#
# All arguments must be in double or single quotes.
#
# $Id: rc.conf,v 1.76 1999/01/17 03:32:07 grog Exp $
# $Id: rc.conf,v 1.77 1999/01/25 18:24:46 dillon Exp $
##############################################################
### Important initial Boot-time options #####################
@ -200,12 +200,9 @@ vinum_slices="" # put in names of vinum slices to enable vinum
### Allow local configuration override at the very end here ##
##############################################################
#
# If the kernel configuration script MIB exists, use it.
sysctl -n kern.conf_dir > /dev/null 2>&1
if [ $? = 0 ]; then
conf_dir=`sysctl -n kern.conf_dir`
fi
# This is typically only useful when run from /etc/rc, where
# rc.diskless may set conf_dir. When run standalone, conf_dir
# is not set and thus /etc/rc.local is used.
if [ "X$conf_dir" = "X" ]; then
conf_dir=/etc