summaryrefslogtreecommitdiff
path: root/src/conf_mode
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2019-11-02 17:16:46 +0100
committerChristian Poessinger <christian@poessinger.com>2019-11-02 17:16:46 +0100
commit37dcd23368de5872a5d56d356d29cafb1b185ce5 (patch)
tree2b2aedb3a5b27fca32d21bf07516e7e284e1f147 /src/conf_mode
parentcd6fc1182e649a72e842567d9aaa6dd39f304e2a (diff)
parent99c762ebbbb30a638760627bc6d5fd86932951e1 (diff)
downloadvyos-1x-37dcd23368de5872a5d56d356d29cafb1b185ce5.tar.gz
vyos-1x-37dcd23368de5872a5d56d356d29cafb1b185ce5.zip
Merge branch 'current' of github.com:vyos/vyos-1x into equuleus
* 'current' of github.com:vyos/vyos-1x: bonding: T1777: change priority to be after ethernet interfaces bridge: T1783: bugfix removal of member interface
Diffstat (limited to 'src/conf_mode')
-rwxr-xr-xsrc/conf_mode/interfaces-bridge.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/conf_mode/interfaces-bridge.py b/src/conf_mode/interfaces-bridge.py
index 70bf4f528..d152384f7 100755
--- a/src/conf_mode/interfaces-bridge.py
+++ b/src/conf_mode/interfaces-bridge.py
@@ -264,7 +264,7 @@ def apply(bridge):
# remove interface from bridge
for intf in bridge['member_remove']:
- br.del_port( intf['name'] )
+ br.del_port(intf)
# add interfaces to bridge
for member in bridge['member']: