move uci_load into config_load so that changes can be applied via uci without commiting

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7927 3c298f89-4303-0410-b956-a3cf2f4a3e73

1 files changed, 21 insertions, 8 deletions

diff --git a/package/base-files/files/etc/functions.sh b/package/base-files/files/etc/functions.sh
index 8d1117163..4446931d5 100755
--- a/package/base-files/files/etc/functions.sh
+++ b/package/base-files/files/etc/functions.sh
@@ -85,19 +85,32 @@ config_clear() {
 }
 
 config_load() {
-	local file
-	case "$1" in
-		/*) file="$1";;
-		*) file="$UCI_ROOT/etc/config/$1";;
+	local cfg
+	local uci
+	local PACKAGE="$1"
+
+	case "$PACKAGE" in
+		/*)	cfg="$PACKAGE"
+			uci=""
+		;;
+		*)	cfg="$UCI_ROOT/etc/config/$PACKAGE"
+			uci="/tmp/.uci/${PACKAGE}"
+		;;
 	esac
+
+	[ -e "$cfg" ] || cfg=""
+	[ -e "$uci" ] || uci=""
+
+	# no config
+	[ -z "$cfg" -a -z "$uci" ] && return 1
+
 	_C=0
 	export ${NO_EXPORT:+-n} CONFIG_SECTIONS=
 	export ${NO_EXPORT:+-n} CONFIG_NUM_SECTIONS=0
 	export ${NO_EXPORT:+-n} CONFIG_SECTION=
-	
-	[ -e "$file" ] && {
-		. $file
-	} || return 1
+
+	${cfg:+. "$cfg"}
+	${uci:+. "$uci"}
 	
 	${CONFIG_SECTION:+config_cb}
 }