summaryrefslogtreecommitdiff
path: root/src/conf_mode
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@vyos.io>2025-02-24 17:39:42 +0000
committerGitHub <noreply@github.com>2025-02-24 17:39:42 +0000
commitd50ce12c521b5dbe5b70619c78eaf1de24e308f9 (patch)
treed799a01e9848107dcc69a1776b755e22a2114a46 /src/conf_mode
parentaf588920ce2fa11966ccfa4f4252328359d1f2da (diff)
parent3c0033508e671db72057cfdb535c530423e3b44f (diff)
downloadvyos-1x-d50ce12c521b5dbe5b70619c78eaf1de24e308f9.tar.gz
vyos-1x-d50ce12c521b5dbe5b70619c78eaf1de24e308f9.zip
Merge pull request #4363 from c-po/bridge-T7192
bridge: T7192: do not allow a member interface to be used multiple times
Diffstat (limited to 'src/conf_mode')
-rwxr-xr-xsrc/conf_mode/interfaces_bridge.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/conf_mode/interfaces_bridge.py b/src/conf_mode/interfaces_bridge.py
index 637db442a..aff93af2a 100755
--- a/src/conf_mode/interfaces_bridge.py
+++ b/src/conf_mode/interfaces_bridge.py
@@ -74,8 +74,9 @@ def get_config(config=None):
for interface in list(bridge['member']['interface']):
# Check if member interface is already member of another bridge
tmp = is_member(conf, interface, 'bridge')
- if tmp and bridge['ifname'] not in tmp:
- bridge['member']['interface'][interface].update({'is_bridge_member' : tmp})
+ if ifname in tmp:
+ del tmp[ifname]
+ if tmp: bridge['member']['interface'][interface].update({'is_bridge_member' : tmp})
# Check if member interface is already member of a bond
tmp = is_member(conf, interface, 'bonding')