From: Tony Ambardar <itugrok@yahoo.com>
Date: Tue, 25 Apr 2017 09:16:56 +0000 (-0700)
Subject: uci: add missing 'option' support to uci_rename()
X-Git-Tag: v18.06.0-rc1~1422
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a367645f23d2ed93ea29c7237fa1b2d6c3ded7e4;p=oweals%2Fopenwrt.git

uci: add missing 'option' support to uci_rename()

When using the uci.sh wrapper, allow parameters to match those supported
by the uci binary i.e. "uci rename <config>.<section>[.<option>]=<name>".

Signed-off-by: Tony Ambardar <itugrok@yahoo.com>
---

diff --git a/package/system/uci/files/lib/config/uci.sh b/package/system/uci/files/lib/config/uci.sh
index 50891a64e4..78ec277669 100644
--- a/package/system/uci/files/lib/config/uci.sh
+++ b/package/system/uci/files/lib/config/uci.sh
@@ -118,9 +118,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() {