From 408b00b6b3caf284592f561fbf6bc5a04a163187 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Thu, 18 Nov 2010 13:08:58 -0800
Subject: Add more checks for bridge/bond conflicts

Don't allow putting bridge port into bond-group (and vice-versa).
---
 scripts/vyatta-bonding.pl | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'scripts/vyatta-bonding.pl')

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);
-- 
cgit v1.2.3