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>
This commit is contained in:
parent
0b7f7606dd
commit
f41dd32722
1 changed files with 4 additions and 1 deletions
|
@ -99,6 +99,8 @@ preinit_config_board() {
|
||||||
}
|
}
|
||||||
|
|
||||||
preinit_ip() {
|
preinit_ip() {
|
||||||
|
[ "$pi_preinit_no_failsafe" = "y" ] && return
|
||||||
|
|
||||||
# if the preinit interface isn't specified and ifname is set in
|
# if the preinit interface isn't specified and ifname is set in
|
||||||
# preinit.arch use that interface
|
# preinit.arch use that interface
|
||||||
if [ -z "$pi_ifname" ]; then
|
if [ -z "$pi_ifname" ]; then
|
||||||
|
@ -110,6 +112,8 @@ preinit_ip() {
|
||||||
elif [ -d "/etc/board.d/" ]; then
|
elif [ -d "/etc/board.d/" ]; then
|
||||||
preinit_config_board
|
preinit_config_board
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
preinit_net_echo "Doing Lede Preinit\n"
|
||||||
}
|
}
|
||||||
|
|
||||||
preinit_ip_deconfig() {
|
preinit_ip_deconfig() {
|
||||||
|
@ -149,7 +153,6 @@ preinit_echo() {
|
||||||
}
|
}
|
||||||
|
|
||||||
pi_indicate_preinit() {
|
pi_indicate_preinit() {
|
||||||
preinit_net_echo "Doing Lede Preinit\n"
|
|
||||||
set_state preinit
|
set_state preinit
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue