diff options
Diffstat (limited to 'etc')
-rw-r--r-- | etc/rc.conf | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/etc/rc.conf b/etc/rc.conf index 0a33ae7..d1b150b 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.81 1999/01/30 07:20:58 newton Exp $ +# $Id: rc.conf,v 1.82 1999/02/04 00:23:10 grog Exp $ ############################################################## ### Important initial Boot-time options ##################### @@ -19,7 +19,7 @@ pccard_mem="DEFAULT" # If pccard_enable=YES, this is card memory address. pccard_ifconfig="NO" # Specialized pccard ethernet configuration (or NO). local_startup="/usr/local/etc/rc.d /usr/X11R6/etc/rc.d" # startup script dirs. local_periodic="/usr/local/etc/periodic /usr/X11R6/etc/periodic" # periodic script dirs -rc_conf_files="rc.conf.site rc.conf.local" +rc_conf_files="/etc/rc.conf.site /etc/rc.conf.local" ############################################################## ### Network configuration sub-section ###################### @@ -201,16 +201,11 @@ vinum_drives="" # put in names of disks containing vinum drives ### Allow local configuration override at the very end here ## ############################################################## # -# 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 -fi +# for i in ${rc_conf_files}; do - if [ -f $conf_dir/$i ]; then - . $conf_dir/$i + if [ -f $i ]; then + . $i fi done + |