diff options
author | dillon <dillon@FreeBSD.org> | 1999-01-26 07:32:59 +0000 |
---|---|---|
committer | dillon <dillon@FreeBSD.org> | 1999-01-26 07:32:59 +0000 |
commit | 1f3fbd42ff69e8cf33874e7bb7e28a999b6ce1a1 (patch) | |
tree | 03e26ea033f1930fed13bebe604cbb9eeb0c4bd0 | |
parent | 9ac0648330841e69e511f27f01a46076727ab7e8 (diff) | |
download | FreeBSD-src-1f3fbd42ff69e8cf33874e7bb7e28a999b6ce1a1.zip FreeBSD-src-1f3fbd42ff69e8cf33874e7bb7e28a999b6ce1a1.tar.gz |
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.
-rw-r--r-- | etc/rc.conf | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/etc/rc.conf b/etc/rc.conf index 8539283..727d502 100644 --- a/etc/rc.conf +++ b/etc/rc.conf @@ -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 |