aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKristian Evensen <kristian.evensen@gmail.com>2019-05-15 20:56:18 +0200
committerPetr Štetiar <ynezz@true.cz>2019-05-17 21:41:43 +0200
commit97780e363f1bfaef9451bb16fa94a0e73a18ebe6 (patch)
treead642cccd86140baf16fed836889b9f4b6cdc0fd
parent869376710d70b1e2c9f5265bc8840738794bb280 (diff)
downloadupstream-97780e363f1bfaef9451bb16fa94a0e73a18ebe6.tar.gz
upstream-97780e363f1bfaef9451bb16fa94a0e73a18ebe6.tar.bz2
upstream-97780e363f1bfaef9451bb16fa94a0e73a18ebe6.zip
system: uci: Use config dir on uci_add and support add_/del_list
This commit makes three changes to the uci shell library: * A check for UCI_CONFIG_DIR has been added to the command line when adding anonymous sections. Without this change, adding anonymous sections to configs not stored in /etc/config is not possible. * Support for adding/removing items from lists were missing, so I have added the functions uci_add_list() and uci_remove_list() to simplify working with uci lists from scripts. Signed-off-by: Kristian Evensen <kristian.evensen@gmail.com> [added missing package version bump] Signed-off-by: Petr Štetiar <ynezz@true.cz>
-rw-r--r--package/system/uci/Makefile2
-rw-r--r--package/system/uci/files/lib/config/uci.sh20
2 files changed, 20 insertions, 2 deletions
diff --git a/package/system/uci/Makefile b/package/system/uci/Makefile
index 64849ec112..0d9ca71a45 100644
--- a/package/system/uci/Makefile
+++ b/package/system/uci/Makefile
@@ -9,7 +9,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=uci
-PKG_RELEASE:=2
+PKG_RELEASE:=3
PKG_SOURCE_URL=$(PROJECT_GIT)/project/uci.git
PKG_SOURCE_PROTO:=git
diff --git a/package/system/uci/files/lib/config/uci.sh b/package/system/uci/files/lib/config/uci.sh
index 78ec277669..1e85ced834 100644
--- a/package/system/uci/files/lib/config/uci.sh
+++ b/package/system/uci/files/lib/config/uci.sh
@@ -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"
@@ -132,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