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 82b730f0c518637bb533ae18bdaa1ea384f36eb5..5442a749b182bde2919eb1f10d8ff553be9bb7e4 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,10 +93,14 @@ preinit_config_board() {
                ifname=${ifname%\.*}
        fi
 
-       preinit_ip_config $ifname
+       pi_ifname=$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
@@ -105,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() {
@@ -138,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
 }