[package] base-files: implement a --force option for sysupgrade to override image...

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

diff --git a/package/uci/files/lib/config/uci.sh b/package/uci/files/lib/config/uci.sh
index d759615..db84c83 100644 (file)
--- a/package/uci/files/lib/config/uci.sh
+++ b/package/uci/files/lib/config/uci.sh
@@ -23,9 +23,15 @@ uci_load() {
        local PACKAGE="$1"
        local DATA
        local RET
        local PACKAGE="$1"
        local DATA
        local RET

+       local VAR

 
        _C=0
        if [ -z "$CONFIG_APPEND" ]; then
 
        _C=0
        if [ -z "$CONFIG_APPEND" ]; then

+               for VAR in $CONFIG_LIST_STATE; do
+                       export ${NO_EXPORT:+-n} CONFIG_${VAR}=
+                       export ${NO_EXPORT:+-n} CONFIG_${VAR}_LENGTH=
+               done
+               export ${NO_EXPORT:+-n} CONFIG_LIST_STATE=

                export ${NO_EXPORT:+-n} CONFIG_SECTIONS=
                export ${NO_EXPORT:+-n} CONFIG_NUM_SECTIONS=0
                export ${NO_EXPORT:+-n} CONFIG_SECTION=
                export ${NO_EXPORT:+-n} CONFIG_SECTIONS=
                export ${NO_EXPORT:+-n} CONFIG_NUM_SECTIONS=0
                export ${NO_EXPORT:+-n} CONFIG_SECTION=


@@ -65,6 +71,11 @@ uci_set_state() {
        /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} -P /var/state set "$PACKAGE.$CONFIG${OPTION:+.$OPTION}=$VALUE"
 }
 
        /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} -P /var/state set "$PACKAGE.$CONFIG${OPTION:+.$OPTION}=$VALUE"
 }
 

+uci_toggle_state() {
+       uci_revert_state "$1" "$2" "$3"
+       uci_set_state "$1" "$2" "$3" "$4"
+}
+

 uci_set() {
        local PACKAGE="$1"
        local CONFIG="$2"
 uci_set() {
        local PACKAGE="$1"
        local CONFIG="$2"