summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Harpin <development@landsofshadow.co.uk>2015-10-19 07:40:14 +0100
committerAlex Harpin <development@landsofshadow.co.uk>2015-10-19 07:40:14 +0100
commit7da003e9e1c85741be72b344badf5e1d371c4e13 (patch)
tree1f29243fa16aa4fde0710eaf2fc39a9a8c73392b
parenta4e2faa36779c7749ed997748c63a1ad4fa56c31 (diff)
downloadvyatta-cfg-system-7da003e9e1c85741be72b344badf5e1d371c4e13.tar.gz
vyatta-cfg-system-7da003e9e1c85741be72b344badf5e1d371c4e13.zip
vyatta-cfg-system: allow bridge slaves to be moved from empty bridges
Allow interfaces to be moved from one bridge to another when they are already configured as part of an empty bridge-group. Bug #476 http://bugzilla.vyos.net/show_bug.cgi?id=476
-rwxr-xr-xscripts/vyatta-bridge.pl4
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/vyatta-bridge.pl b/scripts/vyatta-bridge.pl
index a777b843..36d59212 100755
--- a/scripts/vyatta-bridge.pl
+++ b/scripts/vyatta-bridge.pl
@@ -58,6 +58,10 @@ if (!defined($newbridge) && ($action ne 'SET')) {
$action = 'DELETE';
}
+if (!defined($oldbridge) && ($action ne 'DELETE')) {
+ $action = 'SET';
+}
+
if ($action eq 'SET') {
die "Error: $ifname: not in a bridge-group\n" unless $newbridge;