From 17bc1a7e62db9261846bec442252e32b9b76fd4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Bl=C3=A4se?= Date: Sun, 27 Feb 2022 01:31:52 +0100 Subject: [PATCH] fff-layer3-config: Always clear client interface list completely MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previously, some interfaces in the client ifname list have been kept. The actual reason for this is unknown, it might have been used for the bat0 interfaces. Filtering the interface list in this way might lead to interfaces being retained unintentionally, especially with the diverse naming of DSA interfaces. As it is not required anymore, remove the retention of some interfaces completely. Fixes: #207 Signed-off-by: Fabian Bläse Reviewed-by: Robert Langhammer Reviewed-by: Johannes Kimmel --- .../fff-layer3-config/files/etc/layer3.d/30-network-client | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/packages/fff/fff-layer3-config/files/etc/layer3.d/30-network-client b/src/packages/fff/fff-layer3-config/files/etc/layer3.d/30-network-client index 33d2e2c5..3c4e0558 100644 --- a/src/packages/fff/fff-layer3-config/files/etc/layer3.d/30-network-client +++ b/src/packages/fff/fff-layer3-config/files/etc/layer3.d/30-network-client @@ -50,11 +50,10 @@ configure() { # set interface #remove all eth interfaces - ifaces=$(uci get network.client.ifname | sed 's/\beth[^ ]* *//g' | sed 's/\bswitch[^ ]* *//g') if vlan=$(uci -q get gateway.@client[0].vlan); then - uci set network.client.ifname="${SWITCHDEV}.$vlan $ifaces" + uci set network.client.ifname="${SWITCHDEV}.$vlan" elif iface=$(uci -q get gateway.@client[0].iface); then - uci set network.client.ifname="$iface $ifaces" + uci set network.client.ifname="$iface" else echo "WARNING: No Interface for client specified" fi