base-files: drop unused preinit_echo function

[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 33e90b1d283698f9cadeaeba06a52787f24b7962..5442a749b182bde2919eb1f10d8ff553be9bb7e4 100644 (file)
--- a/package/base-files/files/lib/preinit/10_indicate_preinit
+++ b/package/base-files/files/lib/preinit/10_indicate_preinit
@@ -22,6 +22,44 @@ preinit_ip_config() {
        ip -4 address add $pi_ip/$pi_netmask broadcast $pi_broadcast dev $1
 }
 
+preinit_config_switch() {
+       local role roles ports device enable reset
+
+       local name=$1
+       local lan_if=$2
+
+       json_select switch
+       json_select $name
+
+       json_get_vars enable reset
+
+       if json_is_a roles array; then
+               json_get_keys roles roles
+               json_select roles
+
+               for role in $roles; do
+                       json_select "$role"
+                       json_get_vars ports device
+                       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
+
+       json_select ..
+       json_select ..
+}
+
 preinit_config_board() {
        /bin/board_detect /tmp/board.json
 
@@ -43,13 +81,26 @@ preinit_config_board() {
        # only use the first one
        ifname=${ifname%% *}
 
-       # trim any vlan ids
-       ifname=${ifname%\.*}
+       if [ -x /sbin/swconfig ]; then
+               # configure the switch, if present
+
+               json_get_keys keys switch
+               for key in $keys; do
+                       preinit_config_switch $key $ifname
+               done
+       else
+               # trim any vlan ids
+               ifname=${ifname%\.*}
+       fi
+
+       pi_ifname=$ifname
 
-       preinit_ip_config $ifname
+       preinit_ip_config $pi_ifname
 }
 
 preinit_ip() {
+       [ "$pi_preinit_no_failsafe" = "y" ] && return
+
        # if the preinit interface isn't specified and ifname is set in
        # preinit.arch use that interface
        if [ -z "$pi_ifname" ]; then
@@ -61,6 +112,8 @@ preinit_ip() {
        elif [ -d "/etc/board.d/" ]; then
                preinit_config_board
        fi
+
+       preinit_net_echo "Doing Lede Preinit\n"
 }
 
 preinit_ip_deconfig() {
@@ -94,13 +147,7 @@ preinit_net_echo() {
        }
 }
 
-preinit_echo() {
-       preinit_net_echo $1
-       echo $1
-}
-
 pi_indicate_preinit() {
-       preinit_net_echo "Doing Lede Preinit\n"
        set_state preinit
 }