From bd4c757685d0ed3f0125636956a67b50d4eef1fa Mon Sep 17 00:00:00 2001
From: Jo-Philipp Wich <jow@openwrt.org>
Date: Thu, 26 Nov 2015 12:04:38 +0000
Subject: [PATCH] base-files: uci-defaults-new: fix storing rssi leds and
triggers in board.json
Remove extra nesting of rssi leds in the led object and move rssi monitor
declaration to its own object.
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
SVN-Revision: 47655
---
.../files/lib/functions/uci-defaults-new.sh | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/package/base-files/files/lib/functions/uci-defaults-new.sh b/package/base-files/files/lib/functions/uci-defaults-new.sh
index f795af33d7..6f9d716e9b 100755
--- a/package/base-files/files/lib/functions/uci-defaults-new.sh
+++ b/package/base-files/files/lib/functions/uci-defaults-new.sh
@@ -349,16 +349,16 @@ ucidef_set_led_rssi() {
json_select_object led
- json_select_object rssi
json_select_object "$1"
+ json_add_string type rssi
json_add_string name "$name"
+ json_add_string iface "$iface"
json_add_string sysfs "$sysfs"
json_add_string minq "$minq"
json_add_string maxq "$maxq"
json_add_string offset "$offset"
json_add_string factor "$factor"
json_select ..
- json_select ..
json_select ..
}
@@ -368,12 +368,11 @@ ucidef_set_rssimon() {
local refresh="$2"
local threshold="$3"
- json_select_object led
+ json_select_object rssimon
- json_select_object rssi
- json_add_string type rssi
- json_add_string dev "$dev"
- json_add_string threshold "$threshold"
+ json_select_object "$dev"
+ [ -n "$refresh" ] && json_add_int refresh "$refresh"
+ [ -n "$threshold" ] && json_add_int threshold "$threshold"
json_select ..
json_select ..
--
GitLab