[source] base-files: don't setup network in preinit if failsafe is disabled

LEDE Commits lede-commits at lists.infradead.org
Wed Aug 9 14:19:15 PDT 2017


rmilecki pushed a commit to source.git, branch master:
https://git.lede-project.org/f41dd327223f9d21f23b481c919337b98d2a9f6e

commit f41dd327223f9d21f23b481c919337b98d2a9f6e
Author: Rafał Miłecki <rafal at milecki.pl>
AuthorDate: Mon Aug 7 11:09:33 2017 +0200

    base-files: don't setup network in preinit if failsafe is disabled
    
    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 <rafal at milecki.pl>
---
 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 43bd04d..2c1a63f 100644
--- a/package/base-files/files/lib/preinit/10_indicate_preinit
+++ b/package/base-files/files/lib/preinit/10_indicate_preinit
@@ -99,6 +99,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
@@ -110,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() {
@@ -149,7 +153,6 @@ preinit_echo() {
 }
 
 pi_indicate_preinit() {
-	preinit_net_echo "Doing Lede Preinit\n"
 	set_state preinit
 }
 



More information about the lede-commits mailing list