[openwrt/openwrt] base-files: failsafe: Fix IP configuration

[LEDE Commits]

hauke pushed a commit to openwrt/openwrt.git, branch openwrt-21.02:
https://git.openwrt.org/c0fdfd15fc8f1ad8c75c60a8393a6d8b5c2b3b19

commit c0fdfd15fc8f1ad8c75c60a8393a6d8b5c2b3b19
Author: Hauke Mehrtens <hauke at hauke-m.de>
AuthorDate: Tue Jun 22 00:45:19 2021 +0200

    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: d42640e389a8 ("base-files: use "ports" array in board.json network for bridges")
    Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
    Reviewed-by: Rafał Miłecki <rafal at milecki.pl>
    (cherry picked from commit 467cd378db3359814866ec4121fdb4417783241e)
---
 package/base-files/files/lib/preinit/10_indicate_preinit | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/package/base-files/files/lib/preinit/10_indicate_preinit b/package/base-files/files/lib/preinit/10_indicate_preinit
index 3c59929790..56e96c63ba 100644
--- a/package/base-files/files/lib/preinit/10_indicate_preinit
+++ b/package/base-files/files/lib/preinit/10_indicate_preinit
@@ -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