Author: dougb
Date: Sun Mar 13 16:27:36 2011
New Revision: 219612
URL: http://svn.freebsd.org/changeset/base/219612
Log:
Revert r219578
Modified:
head/etc/rc.subr
Modified: head/etc/rc.subr
==============================================================================
--- head/etc/rc.subr Sun Mar 13 16:20:38 2011 (r219611)
+++ head/etc/rc.subr Sun Mar 13 16:27:36 2011 (r219612)
@@ -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}"
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
