diff options
| author | Doug Barton <dougb@FreeBSD.org> | 2011-03-13 16:27:36 +0000 |
|---|---|---|
| committer | Doug Barton <dougb@FreeBSD.org> | 2011-03-13 16:27:36 +0000 |
| commit | a3b50b560330fa060cbaf894c862b21e7680edea (patch) | |
| tree | 0c6cf467e73a3919f6b7706866df9b1c097e2ece /etc/rc.subr | |
| parent | 18584d14e31e6b102fbe698d4b55ccc2b278ca2c (diff) | |
| download | src-a3b50b560330fa060cbaf894c862b21e7680edea.tar.gz src-a3b50b560330fa060cbaf894c862b21e7680edea.zip | |
Revert r219578
Notes
Notes:
svn path=/head/; revision=219612
Diffstat (limited to 'etc/rc.subr')
| -rw-r--r-- | etc/rc.subr | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/rc.subr b/etc/rc.subr index 8c6a1f55767f..da1b19872d93 100644 --- a/etc/rc.subr +++ b/etc/rc.subr @@ -998,8 +998,9 @@ load_rc_config() err 3 'USAGE: load_rc_config name' fi - if [ -z "$_rc_conf_loaded" ]; then - set -o allexport + if ${_rc_conf_loaded:-false}; then + : + else if [ -r /etc/defaults/rc.conf ]; then debug "Sourcing /etc/defaults/rc.conf" . /etc/defaults/rc.conf @@ -1009,7 +1010,6 @@ load_rc_config() . /etc/rc.conf fi _rc_conf_loaded=true - set +o allexport fi if [ -f /etc/rc.conf.d/"$_name" ]; then debug "Sourcing /etc/rc.conf.d/${_name}" |