summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-12-14 17:29:51 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-12-14 17:29:51 +0000
commitad3f1761248b47c1c931b3c02fd2346258d6ba82 (patch)
tree692e76dc93eb774eb18249000af5eaa8fdca8fbc
parent2bfeaa35643e9c9ae412294c3306a48b71817bb0 (diff)
fix CONFIG_FILENAME in uci_commit()
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5791 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rwxr-xr-xpackage/base-files/files/lib/config/uci.sh3
1 files changed, 2 insertions, 1 deletions
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"