base-files: failsafe: Fix IP configuration

[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 2c1a63f66f3002172474284c3efc9a024a85fdac..56e96c63baabc0c320da9b3db3d4c5c916d6bb97 100644 (file)
--- a/package/base-files/files/lib/preinit/10_indicate_preinit
+++ b/package/base-files/files/lib/preinit/10_indicate_preinit
@@ -1,4 +1,3 @@
-#!/bin/sh
 # Copyright (C) 2006 OpenWrt.org
 # Copyright (C) 2010 Vertical Communications
 
@@ -33,6 +32,11 @@ preinit_config_switch() {
 
        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
@@ -43,19 +47,15 @@ preinit_config_switch() {
                        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 set apply
                        fi
                done
 
                json_select ..
        fi
 
+       swconfig dev $name set apply
+
        json_select ..
        json_select ..
 }
@@ -72,14 +72,20 @@ preinit_config_board() {
 
        json_select network
                json_select "lan"
-                       json_get_vars ifname
+                       json_get_vars device
+                       json_get_values ports ports
                json_select ..
        json_select ..
 
-       [ -n "$ifname" ] || return
+       [ -n "$device" -o -n "$ports" ] || return
+
+       # swconfig uses $device and DSA uses ports
+       [ -z "$ports" ] && {
+               ports="$device"
+       }
 
        # only use the first one
-       ifname=${ifname%% *}
+       ifname=${ports%% *}
 
        if [ -x /sbin/swconfig ]; then
                # configure the switch, if present
@@ -113,7 +119,7 @@ preinit_ip() {
                preinit_config_board
        fi
 
-       preinit_net_echo "Doing Lede Preinit\n"
+       preinit_net_echo "Doing OpenWrt Preinit\n"
 }
 
 preinit_ip_deconfig() {
@@ -147,11 +153,6 @@ preinit_net_echo() {
        }
 }
 
-preinit_echo() {
-       preinit_net_echo $1
-       echo $1
-}
-
 pi_indicate_preinit() {
        set_state preinit
 }