KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

base-files: uci-defaults-new: remove reset/enable args of ucidef_add_switch()

Browse source 
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 <jow@openwrt.org>

SVN-Revision: 47720
This commit is contained in:
Jo-Philipp Wich 2015-12-03 17:30:08 +00:00
parent 80f767d093
commit d17a64c7c0
3 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
package/base-files/files/lib/functions/uci-defaults-new.sh
View file

@ -84,16 +84,12 @@ ucidef_set_interfaces_lan_wan() {
ucidef_add_switch() { ucidef_add_switch() {
local name="$1" local name="$1"
local reset="$2"
local enable="$3"
json_select_object switch json_select_object switch
json_select_object "$name"
json_select_object "$name" json_add_boolean enable 1
json_add_boolean enable "$enable" json_add_boolean reset 1
json_add_boolean reset "$reset" json_select ..
json_select ..
json_select .. json_select ..
} }
@ -103,14 +99,15 @@ ucidef_add_switch_attr() {
local val="$3" local val="$3"
json_select_object switch json_select_object switch
json_select_object "$name" json_select_object "$name"
case "$val" in case "$val" in
[0-9]) json_add_int "$key" "$val" ;; true|false) [ "$val" != "true" ]; json_add_boolean "$key" $? ;;
*) json_add_string "$key" "$val" ;; [0-9]) json_add_int "$key" "$val" ;;
esac *) json_add_string "$key" "$val" ;;
esac
json_select .. json_select ..
json_select .. json_select ..
} }
@ -273,6 +270,7 @@ ucidef_add_switch_port_attr() {
json_select_object attr json_select_object attr
case "$val" in case "$val" in
true|false) [ "$val" != "true" ]; json_add_boolean "$key" $? ;;
[0-9]) json_add_int "$key" "$val" ;; [0-9]) json_add_int "$key" "$val" ;;
*) json_add_string "$key" "$val" ;; *) json_add_string "$key" "$val" ;;
esac esac

3
target/linux/ar71xx/base-files/etc/board.d/02_network
View file

@ -348,7 +348,8 @@ dlan-pro-500-wp)
dlan-pro-1200-ac) dlan-pro-1200-ac)
ucidef_set_interface_lan "eth0" ucidef_set_interface_lan "eth0"
ucidef_add_switch "switch0" "1" "0" ucidef_add_switch "switch0"
ucidef_add_switch_attr "switch0" "reset" "false"
ucidef_add_switch_ports "switch0" \ ucidef_add_switch_ports "switch0" \
"0@eth0" "2:lan" "3:lan" "4:lan" "0@eth0" "2:lan" "3:lan" "4:lan"
;; ;;

6
target/linux/ramips/base-files/etc/board.d/02_network
View file

@ -52,7 +52,8 @@ ramips_setup_interfaces()
w150m|\ w150m|\
wnce2001|\ wnce2001|\
zte-q7) zte-q7)
ucidef_add_switch "switch0" "1" "0" ucidef_add_switch "switch0"
ucidef_add_switch_attr "switch0" "reset" "false"
ucidef_set_interface_lan "eth0" ucidef_set_interface_lan "eth0"
;; ;;
3g-6200nl|\ 3g-6200nl|\
@ -186,7 +187,8 @@ ramips_setup_interfaces()
"1:lan" "2:lan" "3:lan" "4:lan" "5:lan" "0:wan" "6@eth0" "1:lan" "2:lan" "3:lan" "4:lan" "5:lan" "0:wan" "6@eth0"
;; ;;
m2m) m2m)
ucidef_add_switch "switch0" "4" ucidef_add_switch "switch0"
ucidef_add_switch_attr "switch0" "reset" "false"
ucidef_set_interface_lan "eth0" ucidef_set_interface_lan "eth0"
;; ;;
mlwg2|\ mlwg2|\