diff options
| author | Christian Poessinger <christian@poessinger.com> | 2019-11-02 17:16:46 +0100 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2019-11-02 17:16:46 +0100 |
| commit | 37dcd23368de5872a5d56d356d29cafb1b185ce5 (patch) | |
| tree | 2b2aedb3a5b27fca32d21bf07516e7e284e1f147 | |
| parent | cd6fc1182e649a72e842567d9aaa6dd39f304e2a (diff) | |
| parent | 99c762ebbbb30a638760627bc6d5fd86932951e1 (diff) | |
| download | vyos-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
| -rw-r--r-- | interface-definitions/interfaces-bonding.xml | 2 | ||||
| -rwxr-xr-x | src/conf_mode/interfaces-bridge.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/interface-definitions/interfaces-bonding.xml b/interface-definitions/interfaces-bonding.xml index ba1acfff6..821dd15fa 100644 --- a/interface-definitions/interfaces-bonding.xml +++ b/interface-definitions/interfaces-bonding.xml @@ -5,7 +5,7 @@ <tagNode name="bonding" owner="${vyos_conf_scripts_dir}/interfaces-bonding.py"> <properties> <help>Bonding interface name</help> - <priority>315</priority> + <priority>320</priority> <constraint> <regex>bond[0-9]+$</regex> </constraint> 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']: |