diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2006-12-14 17:29:51 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2006-12-14 17:29:51 +0000 |
| commit | 6357539faa6f84d512daab26f9053742fa924c23 (patch) | |
| tree | 692e76dc93eb774eb18249000af5eaa8fdca8fbc /package/base-files | |
| parent | d2fb93ec997c24850b1d60b0ed84d35eca78b2ec (diff) | |
| download | upstream-6357539faa6f84d512daab26f9053742fa924c23.tar.gz upstream-6357539faa6f84d512daab26f9053742fa924c23.tar.bz2 upstream-6357539faa6f84d512daab26f9053742fa924c23.zip | |
fix CONFIG_FILENAME in uci_commit()
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5791 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/base-files')
| -rwxr-xr-x | package/base-files/files/lib/config/uci.sh | 3 |
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" |