system: uci: Use config dir on uci_add and support add_/del_list

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

diff --git a/package/system/uci/files/lib/config/uci.sh b/package/system/uci/files/lib/config/uci.sh
index db84c8343e164c7ec021106eba1d74291e7f6817..1e85ced8342b681041b1a83854150c516f3d8830 100644 (file)
--- a/package/system/uci/files/lib/config/uci.sh
+++ b/package/system/uci/files/lib/config/uci.sh
@@ -2,7 +2,7 @@
 # Shell script compatibility wrappers for /sbin/uci
 #
 # Copyright (C) 2008-2010  OpenWrt.org
-# Copyright (C) 2008  Felix Fietkau <nbd@openwrt.org>
+# Copyright (C) 2008  Felix Fietkau <nbd@nbd.name>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -85,6 +85,15 @@ uci_set() {
        /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} set "$PACKAGE.$CONFIG.$OPTION=$VALUE"
 }
 
+uci_add_list() {
+       local PACKAGE="$1"
+       local CONFIG="$2"
+       local OPTION="$3"
+       local VALUE="$4"
+
+       /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} add_list "$PACKAGE.$CONFIG.$OPTION=$VALUE"
+}
+
 uci_get_state() {
        uci_get "$1" "$2" "$3" "$4" "/var/state"
 }
@@ -108,7 +117,7 @@ uci_add() {
        local CONFIG="$3"
 
        if [ -z "$CONFIG" ]; then
-               export ${NO_EXPORT:+-n} CONFIG_SECTION="$(/sbin/uci add "$PACKAGE" "$TYPE")"
+               export ${NO_EXPORT:+-n} CONFIG_SECTION="$(/sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} add "$PACKAGE" "$TYPE")"
        else
                /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} set "$PACKAGE.$CONFIG=$TYPE"
                export ${NO_EXPORT:+-n} CONFIG_SECTION="$CONFIG"
@@ -118,9 +127,10 @@ uci_add() {
 uci_rename() {
        local PACKAGE="$1"
        local CONFIG="$2"
-       local VALUE="$3"
+       local OPTION="$3"
+       local VALUE="$4"
 
-       /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} rename "$PACKAGE.$CONFIG=$VALUE"
+       /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} rename "$PACKAGE.$CONFIG${VALUE:+.$OPTION}=${VALUE:-$OPTION}"
 }
 
 uci_remove() {
@@ -131,6 +141,15 @@ uci_remove() {
        /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} del "$PACKAGE.$CONFIG${OPTION:+.$OPTION}"
 }
 
+uci_remove_list() {
+       local PACKAGE="$1"
+       local CONFIG="$2"
+       local OPTION="$3"
+       local VALUE="$4"
+
+       /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} del_list "$PACKAGE.$CONFIG.$OPTION=$VALUE"
+}
+
 uci_commit() {
        local PACKAGE="$1"
        /sbin/uci ${UCI_CONFIG_DIR:+-c $UCI_CONFIG_DIR} commit $PACKAGE