[geos] remove remaining uci-defaults

[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 851a0d7..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


@@ -22,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=


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

-       /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} -q show "$1" > /dev/null && return 0
-       /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} import "$1"
-       /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} 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() {


@@ -73,6 +80,23 @@ uci_set() {
        /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} 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() {
        local PACKAGE="$1"
        local TYPE="$2"
 uci_add() {
        local PACKAGE="$1"
        local TYPE="$2"