base-files: failsafe: Fix IP configuration

Adapt the preinit_config_board() to the board.json network changes. It
now looks for the device and the ports variables to configure the LAN
network.

This works with swconfig configurations.

Fixes: FS#3866
Fixes: d42640e389 ("base-files: use "ports" array in board.json network for bridges")
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Reviewed-by: Rafał Miłecki <rafal@milecki.pl>
This commit is contained in:
Hauke Mehrtens 2021-06-22 00:45:19 +02:00
parent 2e17c71095
commit 467cd378db

View File

@ -72,14 +72,20 @@ preinit_config_board() {
json_select network
json_select "lan"
json_get_vars ifname
json_get_vars device
json_get_values ports ports
json_select ..
json_select ..
[ -n "$ifname" ] || return
[ -n "$device" -o -n "$ports" ] || return
# swconfig uses $device and DSA uses ports
[ -z "$ports" ] && {
ports="$device"
}
# only use the first one
ifname=${ifname%% *}
ifname=${ports%% *}
if [ -x /sbin/swconfig ]; then
# configure the switch, if present