summaryrefslogtreecommitdiff
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:20:23 +0200
commit889638c8bf3c88d0acae2b756aa97d6160579b35 (patch)
treec3169d92cd075c97b48ab5d7827384317f82dc56
parentb67b316dd18f8aca13dd90613b64190470678567 (diff)
downloadmtk-20170518-889638c8bf3c88d0acae2b756aa97d6160579b35.zip
mtk-20170518-889638c8bf3c88d0acae2b756aa97d6160579b35.tar.gz
mtk-20170518-889638c8bf3c88d0acae2b756aa97d6160579b35.tar.bz2
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 a30bf34..7a97a8d 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
}