diff options
| author | jkh <jkh@FreeBSD.org> | 1999-01-26 10:15:57 +0000 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1999-01-26 10:15:57 +0000 |
| commit | 737b5191613dc2503e0642188112e95776c3a75e (patch) | |
| tree | 3a7435d7e255cf0af84576a20fb650dbc59df238 /etc | |
| parent | 18916026f2faccf689b8c10a17c316466d3728b7 (diff) | |
| download | FreeBSD-src-737b5191613dc2503e0642188112e95776c3a75e.zip FreeBSD-src-737b5191613dc2503e0642188112e95776c3a75e.tar.gz | |
Allow /etc/rc.conf.site as well as /etc/rc.conf.local (and add rc_conf_files
variable for frobbing).
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/rc.conf | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/etc/rc.conf b/etc/rc.conf index 727d502..b9f06de 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.77 1999/01/25 18:24:46 dillon Exp $ +# $Id: rc.conf,v 1.78 1999/01/26 07:32:59 dillon 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="/etc/rc.conf.site /etc/rc.conf.local" ############################################################## ### Network configuration sub-section ###################### @@ -208,7 +208,8 @@ if [ "X$conf_dir" = "X" ]; then conf_dir=/etc fi -if [ -f $conf_dir/rc.conf.local ]; then - . $conf_dir/rc.conf.local -fi - +for i in ${rc_conf_files}; do + if [ -f $conf_dir/$i ]; then + . $conf_dir/$i + fi +done |
