summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2009-07-07 14:25:06 -0700
committerAn-Cheng Huang <ancheng@vyatta.com>2009-07-17 14:56:05 -0700
commit3d55d4142307d29e513e4ecadf36604b32d4677a (patch)
tree709fe0d69ef7660004c49d337648c6b14d153da7
parente653e618e4bb55db664725b92f06e39c568d7bb8 (diff)
downloadvyatta-cfg-quagga-3d55d4142307d29e513e4ecadf36604b32d4677a.tar.gz
vyatta-cfg-quagga-3d55d4142307d29e513e4ecadf36604b32d4677a.zip
Allow disable of bonding interface with VIF
bug 4694 No reason to block disabling bonding interface with VIF Kernel handles it fine. (cherry picked from commit 3c76bd6b12dd211075d1dd689a2772c534ec7abe)
-rw-r--r--templates/interfaces/bonding/node.tag/disable/node.def7
1 files changed, 1 insertions, 6 deletions
diff --git a/templates/interfaces/bonding/node.tag/disable/node.def b/templates/interfaces/bonding/node.tag/disable/node.def
index 3d3ffef9..ad033365 100644
--- a/templates/interfaces/bonding/node.tag/disable/node.def
+++ b/templates/interfaces/bonding/node.tag/disable/node.def
@@ -1,10 +1,5 @@
help: Set interface disabled
-create: vif=`/opt/vyatta/sbin/vyatta-interfaces.pl --vif=$VAR(../@) --show=all`
- if [ ! -z "$vif" ]; then
- echo "Can not disable interface " $VAR(../@) " with vif:" $vif
- exit 1
- fi
- /etc/netplug/linkdown.d/dhclient $VAR(../@)
+create: /etc/netplug/linkdown.d/dhclient $VAR(../@)
if ! sudo ip link set $VAR(../@) down 2>/dev/null; then
echo "Error disabling dev $VAR(../@)"
/etc/netplug/linkup.d/dhclient $VAR(../@)