diff options
| author | rbalocca <rbalocca@vyatta.com> | 2008-04-14 18:23:09 -0700 |
|---|---|---|
| committer | rbalocca <rbalocca@vyatta.com> | 2008-04-14 18:23:09 -0700 |
| commit | 894a73759de66ea411824bbdaf99d07b8eeb2faf (patch) | |
| tree | 67f6fda887ec5f881bbfdfe4b72f2422199a6ecc /templates/interfaces/bridge/node.def | |
| parent | 919ac0e4a35509f32fc6eaf6b0c5dac686b3b5db (diff) | |
| parent | 4c42c6bde357423f0704a6e5b1ea70081944a1bb (diff) | |
| download | vyatta-cfg-system-894a73759de66ea411824bbdaf99d07b8eeb2faf.tar.gz vyatta-cfg-system-894a73759de66ea411824bbdaf99d07b8eeb2faf.zip | |
Merge branch 'glendale' into hollywood
Conflicts:
templates/interfaces/bridge/node.def
templates/interfaces/ethernet/node.tag/bridge-group/node.def
Diffstat (limited to 'templates/interfaces/bridge/node.def')
| -rw-r--r-- | templates/interfaces/bridge/node.def | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/templates/interfaces/bridge/node.def b/templates/interfaces/bridge/node.def index f6b2a8d6..b59ba7b2 100644 --- a/templates/interfaces/bridge/node.def +++ b/templates/interfaces/bridge/node.def @@ -2,6 +2,14 @@ tag: type: txt help: Set 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)" |