base-files: preinit: also config switch when no port roles defined

[openwrt/staging/wigyori.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 c3ec7bfdf77bc95d4881755a1ec59711da4448a3..423c425223ed0882b355f54eb471b06743f27669 100644 (file)
--- a/package/base-files/files/lib/preinit/10_indicate_preinit
+++ b/package/base-files/files/lib/preinit/10_indicate_preinit
@@ -33,6 +33,11 @@ preinit_config_switch() {
 
        json_get_vars enable reset
 
 
        json_get_vars enable reset
 

+       if [ "$reset" -eq "1" ]; then
+               swconfig dev $name set reset
+       fi
+       swconfig dev $name set enable_vlan $enable
+

        if json_is_a roles array; then
                json_get_keys roles roles
                json_select roles
        if json_is_a roles array; then
                json_get_keys roles roles
                json_select roles


@@ -43,19 +48,15 @@ preinit_config_switch() {
                        json_select ..
 
                        if [ "$device" = "$lan_if" ]; then
                        json_select ..
 
                        if [ "$device" = "$lan_if" ]; then

-                               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 vlan $role set ports "$ports"

-                               swconfig dev $name set apply

                        fi
                done
 
                json_select ..
        fi
 
                        fi
                done
 
                json_select ..
        fi
 

+       swconfig dev $name set apply
+

        json_select ..
        json_select ..
 }
        json_select ..
        json_select ..
 }