ath9k: do not adjust the slot time setting for long distance, it seems to cause long...

[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 c226f4f..8dcb92b 100644 (file)
--- a/package/uci/files/lib/config/uci.sh
+++ b/package/uci/files/lib/config/uci.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 # Shell script compatibility wrappers for /sbin/uci
 #
 #!/bin/sh
 # Shell script compatibility wrappers for /sbin/uci
 #

+# Copyright (C) 2008-2010  OpenWrt.org

 # Copyright (C) 2008  Felix Fietkau <nbd@openwrt.org>
 #
 # This program is free software; you can redistribute it and/or modify
 # Copyright (C) 2008  Felix Fietkau <nbd@openwrt.org>
 #
 # This program is free software; you can redistribute it and/or modify


@@ -17,19 +18,26 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 

+CONFIG_APPEND=

 uci_load() {
        local PACKAGE="$1"
        local DATA
        local RET
 uci_load() {
        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=
        fi
 
                export ${NO_EXPORT:+-n} CONFIG_SECTIONS=
                export ${NO_EXPORT:+-n} CONFIG_NUM_SECTIONS=0
                export ${NO_EXPORT:+-n} CONFIG_SECTION=
        fi
 

-       DATA="$(/sbin/uci ${LOAD_STATE:+-P /var/state} -S -n export "$PACKAGE" 2>/dev/null)"
+       DATA="$(/sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} ${LOAD_STATE:+-P /var/state} -S -n export "$PACKAGE" 2>/dev/null)"

        RET="$?"
        [ "$RET" != 0 -o -z "$DATA" ] || eval "$DATA"
        unset DATA
        RET="$?"
        [ "$RET" != 0 -o -z "$DATA" ] || eval "$DATA"
        unset DATA


@@ -40,9 +48,9 @@ uci_load() {
 
 uci_set_default() {
        local PACKAGE="$1"
 
 uci_set_default() {
        local PACKAGE="$1"

-       /sbin/uci -q show "$1" > /dev/null && return 0
-       /sbin/uci import "$1"
-       /sbin/uci commit "$1"
+       /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} -q show "$PACKAGE" > /dev/null && return 0
+       /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} import "$PACKAGE"
+       /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} commit "$PACKAGE"

 }
 
 uci_revert_state() {
 }
 
 uci_revert_state() {


@@ -50,7 +58,7 @@ uci_revert_state() {
        local CONFIG="$2"
        local OPTION="$3"
 
        local CONFIG="$2"
        local OPTION="$3"
 

-       /sbin/uci -P /var/state revert "$PACKAGE${CONFIG:+.$CONFIG}${OPTION:+.$OPTION}"
+       /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} -P /var/state revert "$PACKAGE${CONFIG:+.$CONFIG}${OPTION:+.$OPTION}"

 }
 
 uci_set_state() {
 }
 
 uci_set_state() {


@@ -59,8 +67,8 @@ uci_set_state() {
        local OPTION="$3"
        local VALUE="$4"
 
        local OPTION="$3"
        local VALUE="$4"
 

-       [ -z "$VALUE" ] && return 0
-       /sbin/uci -P /var/state set "$PACKAGE.$CONFIG${OPTION:+.$OPTION}=$VALUE"
+       [ "$#" = 4 ] || return 0
+       /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} -P /var/state set "$PACKAGE.$CONFIG${OPTION:+.$OPTION}=$VALUE"

 }
 
 uci_set() {
 }
 
 uci_set() {


@@ -69,7 +77,24 @@ uci_set() {
        local OPTION="$3"
        local VALUE="$4"
 
        local OPTION="$3"
        local VALUE="$4"
 

-       /sbin/uci set "$PACKAGE.$CONFIG.$OPTION=$VALUE"
+       /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} set "$PACKAGE.$CONFIG.$OPTION=$VALUE"
+}
+
+uci_get_state() {
+       uci_get "$1" "$2" "$3" "$4" "/var/state"
+}
+
+uci_get() {
+       local PACKAGE="$1"
+       local CONFIG="$2"
+       local OPTION="$3"
+       local DEFAULT="$4"
+       local STATE="$5"
+
+       /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} ${STATE:+-P $STATE} -q get "$PACKAGE${CONFIG:+.$CONFIG}${OPTION:+.$OPTION}"
+       RET="$?"
+       [ "$RET" -ne 0 ] && [ -n "$DEFAULT" ] && echo "$DEFAULT"
+       return "$RET"

 }
 
 uci_add() {
 }
 
 uci_add() {


@@ -80,7 +105,7 @@ uci_add() {
        if [ -z "$CONFIG" ]; then
                export ${NO_EXPORT:+-n} CONFIG_SECTION="$(/sbin/uci add "$PACKAGE" "$TYPE")"
        else
        if [ -z "$CONFIG" ]; then
                export ${NO_EXPORT:+-n} CONFIG_SECTION="$(/sbin/uci add "$PACKAGE" "$TYPE")"
        else

-               /sbin/uci set "$PACKAGE.$CONFIG=$TYPE"
+               /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} set "$PACKAGE.$CONFIG=$TYPE"

                export ${NO_EXPORT:+-n} CONFIG_SECTION="$CONFIG"
        fi
 }
                export ${NO_EXPORT:+-n} CONFIG_SECTION="$CONFIG"
        fi
 }


@@ -90,7 +115,7 @@ uci_rename() {
        local CONFIG="$2"
        local VALUE="$3"
 
        local CONFIG="$2"
        local VALUE="$3"
 

-       /sbin/uci rename "$PACKAGE.$CONFIG=$VALUE"
+       /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} rename "$PACKAGE.$CONFIG=$VALUE"

 }
 
 uci_remove() {
 }
 
 uci_remove() {


@@ -98,10 +123,10 @@ uci_remove() {
        local CONFIG="$2"
        local OPTION="$3"
 
        local CONFIG="$2"
        local OPTION="$3"
 

-       /sbin/uci del "$PACKAGE.$CONFIG${OPTION:+.$OPTION}"
+       /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} del "$PACKAGE.$CONFIG${OPTION:+.$OPTION}"

 }
 
 uci_commit() {
        local PACKAGE="$1"
 }
 
 uci_commit() {
        local PACKAGE="$1"

-       /sbin/uci commit $PACKAGE
+       /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} commit $PACKAGE

 }
 }