diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2007-06-15 15:12:57 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2007-06-15 15:12:57 +0000 |
| commit | 7afe6ce15884a3f8a121627cf871eadfe702b92b (patch) | |
| tree | 94ad4ffb3b8545004eac69145a415c48f3b1d765 /package/base-files/files/lib | |
| parent | c0d94efc1e32bdfd100fa82469c3cc4762f646ca (diff) | |
| download | upstream-7afe6ce15884a3f8a121627cf871eadfe702b92b.tar.gz upstream-7afe6ce15884a3f8a121627cf871eadfe702b92b.tar.bz2 upstream-7afe6ce15884a3f8a121627cf871eadfe702b92b.zip | |
allow config_* and uci_* functions to work on files outside of /etc/config - these files are assumed to use commands generated by uci_* only (as overlay to regular config files)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7636 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/base-files/files/lib')
| -rw-r--r-- | package/base-files/files/lib/config/uci.sh | 40 |
1 files changed, 29 insertions, 11 deletions
diff --git a/package/base-files/files/lib/config/uci.sh b/package/base-files/files/lib/config/uci.sh index e0293363b3..e0cd1763c3 100644 --- a/package/base-files/files/lib/config/uci.sh +++ b/package/base-files/files/lib/config/uci.sh @@ -62,10 +62,18 @@ uci_add_update() { local PACKAGE="$1" local UPDATE="$2" local PACKAGE_BASE="$(basename "$PACKAGE")" - + local UCIFILE + + case "$PACKAGE" in + /*) UCIFILE="$PACKAGE";; + *) + UCIDIR="/tmp/.uci/$PACKAGE_BASE" + mkdir -p "/tmp/.uci" + ;; + esac + # FIXME: add locking? - mkdir -p "/tmp/.uci" - echo "$UPDATE" >> "/tmp/.uci/${PACKAGE_BASE}" + echo "$UPDATE" >> "$UCIFILE" } uci_set() { @@ -74,14 +82,21 @@ uci_set() { local OPTION="$3" local VALUE="$4" - ( # spawn a subshell so you don't mess up the current environment - uci_load "$PACKAGE" - config_get OLDVAL "$CONFIG" "$OPTION" - if [ "$OLDVAL" != "$VALUE" ]; then - config_get type "$CONFIG" TYPE - [ -z "$type" ] - fi - ) || uci_add_update "$PACKAGE" "config_set '$CONFIG' '$OPTION' '$VALUE'" + case "$PACKAGE" in + /*) + uci_add_update "$PACKAGE" "config_set '$CONFIG' '$OPTION' '$VALUE'" + ;; + *) + ( # spawn a subshell so you don't mess up the current environment + uci_load "$PACKAGE" + config_get OLDVAL "$CONFIG" "$OPTION" + if [ "$OLDVAL" != "$VALUE" ]; then + config_get type "$CONFIG" TYPE + [ -z "$type" ] + fi + ) || uci_add_update "$PACKAGE" "config_set '$CONFIG' '$OPTION' '$VALUE'" + ;; + esac } uci_add() { @@ -116,6 +131,9 @@ uci_commit() { local PACKAGE="$1" local PACKAGE_BASE="$(basename "$PACKAGE")" + case "$PACKAGE" in + /*) return 0;; + esac mkdir -p /tmp/.uci LOCK=`which lock` || LOCK=: $LOCK "/tmp/.uci/$PACKAGE_BASE.lock" |