From 889638c8bf3c88d0acae2b756aa97d6160579b35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= Date: Mon, 7 Aug 2017 11:09:33 +0200 Subject: [PATCH] base-files: don't setup network in preinit if failsafe is disabled MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit With failsafe disabled there is no point in early network setup. We don't send announcement over UDP and there is no way to ssh to the device. A side effect of this is avoiding a possibly incorrect network config (only with failsafe disabled). This problem is related to possible changes made by user in /etc/config/network. Signed-off-by: Rafał Miłecki --- package/base-files/files/lib/preinit/10_indicate_preinit | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/package/base-files/files/lib/preinit/10_indicate_preinit b/package/base-files/files/lib/preinit/10_indicate_preinit index a30bf34f6e..7a97a8dd0f 100644 --- a/package/base-files/files/lib/preinit/10_indicate_preinit +++ b/package/base-files/files/lib/preinit/10_indicate_preinit @@ -96,6 +96,8 @@ preinit_config_board() { } 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 @@ -107,6 +109,8 @@ preinit_ip() { elif [ -d "/etc/board.d/" ]; then preinit_config_board fi + + preinit_net_echo "Doing Lede Preinit\n" } preinit_ip_deconfig() { @@ -146,7 +150,6 @@ preinit_echo() { } pi_indicate_preinit() { - preinit_net_echo "Doing Lede Preinit\n" set_state preinit }