fix CONFIG_FILENAME in uci_commit()

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

diff --git a/package/base-files/files/lib/config/uci.sh b/package/base-files/files/lib/config/uci.sh
index bd13222..12795d8 100755 (executable)
--- 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"