base-files: board.json's switch reset means existence, not argument

[openwrt/openwrt.git] / package / base-files / files / lib / preinit / 10_indicate_preinit

diff --git a/package/base-files/files/lib/preinit/10_indicate_preinit b/package/base-files/files/lib/preinit/10_indicate_preinit
index 82b730f0c518637bb533ae18bdaa1ea384f36eb5..43bd04d44419fc88abd31268c2d1f15d2d61ee44 100644 (file)
--- 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
@@ -90,7 +93,9 @@ preinit_config_board() {
                ifname=${ifname%\.*}
        fi
 
-       preinit_ip_config $ifname
+       pi_ifname=$ifname
+
+       preinit_ip_config $pi_ifname
 }
 
 preinit_ip() {