domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

base-files: failsafe: Fix IP configuration

Browse Source 
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>
(cherry picked from commit 467cd378db)
This commit is contained in:
Hauke Mehrtens
2021-06-22 00:45:19 +02:00
parent 98b1a6435f
commit c0fdfd15fc
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
package/base-files/files/lib/preinit/10_indicate_preinit
View File

@@ -72,14 +72,20 @@ preinit_config_board() {
json_select network json_select network
json_select "lan" json_select "lan"
json_get_vars ifname json_get_vars device
json_get_values ports ports
json_select .. json_select ..
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 # only use the first one
ifname=${ifname%% *} ifname=${ports%% *}
if [ -x /sbin/swconfig ]; then if [ -x /sbin/swconfig ]; then
# configure the switch, if present # configure the switch, if present