From: Felix Fietkau <nbd@openwrt.org>
Date: Thu, 14 Dec 2006 17:29:51 +0000 (+0000)
Subject: fix CONFIG_FILENAME in uci_commit()
X-Git-Tag: reboot~30269
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=218b00653659cba2b3249494cfc11b6d3494ce76;p=openwrt%2Fstaging%2Fpepe2k.git

fix CONFIG_FILENAME in uci_commit()

SVN-Revision: 5791
---

diff --git a/package/base-files/files/lib/config/uci.sh b/package/base-files/files/lib/config/uci.sh
index bd1322252e..12795d813f 100755
--- a/package/base-files/files/lib/config/uci.sh
+++ b/package/base-files/files/lib/config/uci.sh
@@ -127,7 +127,8 @@ uci_commit() {
 			return 0
 		}
 		
-		config_load "$PACKAGE" || CONFIG_FILENAME="$ROOT/etc/config/$PACKAGE_BASE"
+		config_load "$PACKAGE"
+		CONFIG_FILENAME="${CONFIG_FILENAME:-$ROOT/etc/config/$PACKAGE_BASE}"
 		uci_do_update "$CONFIG_FILENAME" "$updatestr" > "/tmp/.uci/$PACKAGE_BASE.new" && {
 			mv -f "/tmp/.uci/$PACKAGE_BASE.new" "$CONFIG_FILENAME" && \
 			rm -f "/tmp/.uci/$PACKAGE_BASE"