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 --- target/linux/ar71xx/base-files/etc/board.d/02_network | 3 ++- target/linux/ramips/base-files/etc/board.d/02_network | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'target/linux') diff --git a/target/linux/ar71xx/base-files/etc/board.d/02_network b/target/linux/ar71xx/base-files/etc/board.d/02_network index 72156b25cf..707f7d6798 100755 --- a/target/linux/ar71xx/base-files/etc/board.d/02_network +++ b/target/linux/ar71xx/base-files/etc/board.d/02_network @@ -348,7 +348,8 @@ dlan-pro-500-wp) dlan-pro-1200-ac) 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" \ "0@eth0" "2:lan" "3:lan" "4:lan" ;; diff --git a/target/linux/ramips/base-files/etc/board.d/02_network b/target/linux/ramips/base-files/etc/board.d/02_network index 16e7b6fa13..c8bdc77a69 100755 --- a/target/linux/ramips/base-files/etc/board.d/02_network +++ b/target/linux/ramips/base-files/etc/board.d/02_network @@ -52,7 +52,8 @@ ramips_setup_interfaces() w150m|\ wnce2001|\ zte-q7) - ucidef_add_switch "switch0" "1" "0" + ucidef_add_switch "switch0" + ucidef_add_switch_attr "switch0" "reset" "false" ucidef_set_interface_lan "eth0" ;; 3g-6200nl|\ @@ -186,7 +187,8 @@ ramips_setup_interfaces() "1:lan" "2:lan" "3:lan" "4:lan" "5:lan" "0:wan" "6@eth0" ;; m2m) - ucidef_add_switch "switch0" "4" + ucidef_add_switch "switch0" + ucidef_add_switch_attr "switch0" "reset" "false" ucidef_set_interface_lan "eth0" ;; mlwg2|\ -- cgit v1.2.3