From 605c909287c19a334fb7fe2dd363392dd8d59e13 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Thu, 3 Dec 2015 17:30:08 +0000 Subject: base-files: uci-defaults-new: remove reset/enable args of ucidef_add_switch() Out of 69 switch definitions, only 3 pass something different than "1" as values for reset and enable, with one of those three being invalid. This change ... * removes the reset and enable arguments from ucidef_add_switch() * unconditionally writes reset:1 and enable:1 to JSON * converts the three users of nonstandard values to ucidef_add_switch_attr() Signed-off-by: Jo-Philipp Wich git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47720 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../files/lib/functions/uci-defaults-new.sh | 26 ++++++++++------------ 1 file changed, 12 insertions(+), 14 deletions(-) (limited to 'package/base-files/files') 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 4a7cca4df0..e652a8b521 100755 --- a/package/base-files/files/lib/functions/uci-defaults-new.sh +++ b/package/base-files/files/lib/functions/uci-defaults-new.sh @@ -84,16 +84,12 @@ ucidef_set_interfaces_lan_wan() { ucidef_add_switch() { local name="$1" - local reset="$2" - local enable="$3" json_select_object switch - - json_select_object "$name" - json_add_boolean enable "$enable" - json_add_boolean reset "$reset" - json_select .. - + json_select_object "$name" + json_add_boolean enable 1 + json_add_boolean reset 1 + json_select .. json_select .. } @@ -103,14 +99,15 @@ ucidef_add_switch_attr() { local val="$3" json_select_object switch - json_select_object "$name" + json_select_object "$name" - case "$val" in - [0-9]) json_add_int "$key" "$val" ;; - *) json_add_string "$key" "$val" ;; - esac + case "$val" in + true|false) [ "$val" != "true" ]; json_add_boolean "$key" $? ;; + [0-9]) json_add_int "$key" "$val" ;; + *) json_add_string "$key" "$val" ;; + esac - json_select .. + json_select .. json_select .. } @@ -273,6 +270,7 @@ ucidef_add_switch_port_attr() { json_select_object attr case "$val" in + true|false) [ "$val" != "true" ]; json_add_boolean "$key" $? ;; [0-9]) json_add_int "$key" "$val" ;; *) json_add_string "$key" "$val" ;; esac -- cgit v1.2.3