summaryrefslogtreecommitdiff
path: root/templates/interfaces/bridge
diff options
context:
space:
mode:
authorStig Thormodsrud <stig@vyatta.com>2008-04-14 15:09:01 -0700
committerStig Thormodsrud <stig@vyatta.com>2008-04-14 15:09:01 -0700
commit4c42c6bde357423f0704a6e5b1ea70081944a1bb (patch)
tree763ed9e52cb3b6966ce97dd54964e5d1647e1ceb /templates/interfaces/bridge
parentfd65713869e3b665e8df5f7adf21cd550a84b184 (diff)
downloadvyatta-cfg-quagga-4c42c6bde357423f0704a6e5b1ea70081944a1bb.tar.gz
vyatta-cfg-quagga-4c42c6bde357423f0704a6e5b1ea70081944a1bb.zip
Fix 3148: can't delete bridge interface
Diffstat (limited to 'templates/interfaces/bridge')
-rw-r--r--templates/interfaces/bridge/node.def13
1 files changed, 11 insertions, 2 deletions
diff --git a/templates/interfaces/bridge/node.def b/templates/interfaces/bridge/node.def
index ff643980..6af845f3 100644
--- a/templates/interfaces/bridge/node.def
+++ b/templates/interfaces/bridge/node.def
@@ -1,7 +1,16 @@
tag:
type: txt
help: Configure a bridge interface
+
syntax:expression: $VAR(@) in "br0", "br1", "br2", "br3", "br4", "br5", "br6", "br7", "br8", "br9" ; "Must be (br0 - br9)"
-create:expression: "sudo brctl addbr $VAR(@)"
-delete:expression: "sudo brctl delbr $VAR(@)"
+
+create: sudo brctl addbr $VAR(@)
+
+delete: if [ -n "`/usr/sbin/brctl show | grep $VAR(@) | grep eth`" ]; then
+ echo "Interfaces are still assigned to bridge $VAR(@)";
+ exit 1;
+ fi;
+ sudo ip link set $VAR(@) down;
+ sudo brctl delbr $VAR(@);
+
comp_help: "Enter bridge interface name (br0 - br9)"