From 66c4acf134e3f7d9a5eeb2cbf1ead60fe4b96a66 Mon Sep 17 00:00:00 2001
From: dougb <dougb@FreeBSD.org>
Date: Sun, 13 Mar 2011 16:27:36 +0000
Subject: Revert r219578

---
 etc/rc.subr | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'etc/rc.subr')

diff --git a/etc/rc.subr b/etc/rc.subr
index 8c6a1f5..da1b198 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}"
-- 
cgit v1.1