From 5d0843438caaf374b7f8ad7496ecf26f7523ab70 Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Fri, 31 Jul 2009 21:59:46 -0700
Subject: BONDING: handle change of bond-group

Use similar action to new bridge-group
Bug 4768
---
 .../interfaces/ethernet/node.tag/bond-group/node.def   | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

(limited to 'templates/interfaces')

diff --git a/templates/interfaces/ethernet/node.tag/bond-group/node.def b/templates/interfaces/ethernet/node.tag/bond-group/node.def
index d2a398a1..f65a9bde 100644
--- a/templates/interfaces/ethernet/node.tag/bond-group/node.def
+++ b/templates/interfaces/ethernet/node.tag/bond-group/node.def
@@ -3,14 +3,10 @@ help: Add this interface to a bonding group
 commit:expression: exec \
     "/opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(@) --check=bonding"
 allowed: /opt/vyatta/sbin/vyatta-interfaces.pl --show=bonding
-end: ethif=$VAR(../@)
-     old=`/opt/vyatta/sbin/vyatta-cli-expand-var.pl \$\(/interfaces/ethernet/$ethif/bond-group/@\)`
-     new=$VAR(@)
-    if [ ${COMMIT_ACTION} = 'SET' ]; then
-	sudo ${vyatta_sbindir}/vyatta-bonding.pl --dev=$new --add=$ethif
-    elif [ ${COMMIT_ACTION} = 'DELETE' ]; then
-	sudo ${vyatta_sbindir}/vyatta-bonding.pl --dev=$new --remove=$ethif
-    elif [ "$old" != "$new" ]; then
-	sudo ${vyatta_sbindir}/vyatta-bonding.pl --dev=$old --remove=$ethif
-	sudo ${vyatta_sbindir}/vyatta-bonding.pl --dev=$new --add=$ethif
-    fi
+update: eth=$VAR(../@); new=$VAR(@)
+        old=`/opt/vyatta/sbin/vyatta-cli-expand-var.pl \$\(/interfaces/ethernet/$ethif/bond-group/@\)`
+       if [ -n "$old" ]; then
+           sudo ${vyatta_sbindir}/vyatta-bonding.pl --dev=$old --remove=$ethif
+       fi
+       sudo ${vyatta_sbindir}/vyatta-bonding.pl --dev=$new --add=$ethif
+delete:	sudo ${vyatta_sbindir}/vyatta-bonding.pl --dev=$new --remove=$ethif
-- 
cgit v1.2.3