From: Jonas Gorski Date: Sun, 11 Jun 2017 10:50:14 +0000 (+0200) Subject: base-files: board.json's switch reset means existence, not argument X-Git-Tag: v17.01.5~204 X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=commitdiff_plain;h=9c3e4b54343b85cc24cf231a7a863ffafeb1f287 base-files: board.json's switch reset means existence, not argument Don't pass the value unconditionally to swconfig as a parameter but instead only call reset if it is 1. Signed-off-by: Jonas Gorski (cherry picked from commit fd952c7a83e5357f5dcab28c0bcaca756e27eaa0) --- diff --git a/package/base-files/files/lib/preinit/10_indicate_preinit b/package/base-files/files/lib/preinit/10_indicate_preinit index 7a97a8dd0f..2c1a63f66f 100644 --- a/package/base-files/files/lib/preinit/10_indicate_preinit +++ b/package/base-files/files/lib/preinit/10_indicate_preinit @@ -43,7 +43,10 @@ preinit_config_switch() { json_select .. if [ "$device" = "$lan_if" ]; then - swconfig dev $name set reset $reset + if [ "$reset" -eq "1" ]; then + swconfig dev $name set reset + fi + swconfig dev $name set enable_vlan $enable swconfig dev $name vlan $role set ports "$ports" swconfig dev $name set apply