From 7d1580ca211cb2f391bba9c10d29f27a15cb3773 Mon Sep 17 00:00:00 2001 From: Tobias Waldekranz Date: Tue, 3 Oct 2023 15:02:29 +0200 Subject: [PATCH] board/common: nameif: Make switch port marking more robust Let's operate on JSON data, so that we're less vulnerable to output changes in devlink. --- board/common/rootfs/lib/infix/nameif | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/board/common/rootfs/lib/infix/nameif b/board/common/rootfs/lib/infix/nameif index 4ff8e3d9..33039259 100755 --- a/board/common/rootfs/lib/infix/nameif +++ b/board/common/rootfs/lib/infix/nameif @@ -30,7 +30,9 @@ for netif in /sys/class/net/*; do done # Find and mark all switch ports -ports=$(devlink port 2>/dev/null | awk '/flavour physical/{print $5}') +ports=$(devlink -j port | jq -r '.port[] + | select(.flavour == "physical") + | .netdev') for iface in $ports; do ip link set "$iface" group port done