aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafał Miłecki <rafal@milecki.pl>2017-08-07 11:09:33 +0200
committerRafał Miłecki <rafal@milecki.pl>2017-08-09 23:18:59 +0200
commitf41dd327223f9d21f23b481c919337b98d2a9f6e (patch)
tree394c610491f25262fb471615071621d79e3ac61a
parent0b7f7606dd509084813571b68ef8bf4f8bfdcee3 (diff)
downloadupstream-f41dd327223f9d21f23b481c919337b98d2a9f6e.tar.gz
upstream-f41dd327223f9d21f23b481c919337b98d2a9f6e.tar.bz2
upstream-f41dd327223f9d21f23b481c919337b98d2a9f6e.zip
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@milecki.pl>
-rw-r--r--package/base-files/files/lib/preinit/10_indicate_preinit5
1 files changed, 4 insertions, 1 deletions
diff --git a/package/base-files/files/lib/preinit/10_indicate_preinit b/package/base-files/files/lib/preinit/10_indicate_preinit
index 43bd04d444..2c1a63f66f 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
}