summaryrefslogtreecommitdiff
path: root/scripts/vyatta-bonding.pl
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2010-11-18 13:08:58 -0800
committerStephen Hemminger <stephen.hemminger@vyatta.com>2010-11-18 13:08:58 -0800
commit408b00b6b3caf284592f561fbf6bc5a04a163187 (patch)
tree802296110b251b54bb8e7fbc7c33eed7ab71bb30 /scripts/vyatta-bonding.pl
parent6ec63ce719500b97423975e2488c605f44d8b644 (diff)
downloadvyatta-cfg-system-408b00b6b3caf284592f561fbf6bc5a04a163187.tar.gz
vyatta-cfg-system-408b00b6b3caf284592f561fbf6bc5a04a163187.zip
Add more checks for bridge/bond conflicts
Don't allow putting bridge port into bond-group (and vice-versa).
Diffstat (limited to 'scripts/vyatta-bonding.pl')
-rwxr-xr-xscripts/vyatta-bonding.pl3
1 files changed, 3 insertions, 0 deletions
diff --git a/scripts/vyatta-bonding.pl b/scripts/vyatta-bonding.pl
index be09e754..fe07b1a2 100755
--- a/scripts/vyatta-bonding.pl
+++ b/scripts/vyatta-bonding.pl
@@ -196,6 +196,9 @@ sub commit_check {
die "Error: can not add disabled interface $slave to bond-group $intf\n"
if $cfg->exists('disable');
+ die "Error: can not add interface $slave that is part of bridge to bond-group\n"
+ if defined($cfg->returnValue("bridge-group bridge"));
+
my @addr = $cfg->returnValues('address');
die "Error: can not add interface $slave with addresses to bond-group\n"
if (@addr);