fix CONFIG_FILENAME in uci_commit()

[openwrt.git] / package / base-files / files / lib / config / uci.sh

diff --git a/package/base-files/files/lib/config/uci.sh b/package/base-files/files/lib/config/uci.sh
index 92bc1a0..12795d8 100755 (executable)
--- a/package/base-files/files/lib/config/uci.sh
+++ b/package/base-files/files/lib/config/uci.sh
@@ -23,7 +23,7 @@ uci_load() {
        config_load "$PACKAGE"
        local PACKAGE_BASE="$(basename "$PACKAGE")"
        [ -f "/tmp/.uci/${PACKAGE_BASE}" ] && {
        config_load "$PACKAGE"
        local PACKAGE_BASE="$(basename "$PACKAGE")"
        [ -f "/tmp/.uci/${PACKAGE_BASE}" ] && {

-               . "/tmp/.uci/${PACKAGE_BASE}" 2>&/dev/null >&/dev/null
+               . "/tmp/.uci/${PACKAGE_BASE}" 2>/dev/null >/dev/null

                config_cb
        }
 }
                config_cb
        }
 }


@@ -127,7 +127,8 @@ uci_commit() {
                        return 0
                }
                
                        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"
                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"