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 | |
| 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')
| -rw-r--r-- | templates/interfaces/bridge/node.def | 12 | ||||
| -rw-r--r-- | templates/interfaces/ethernet/node.tag/bridge-group/node.def | 35 |
2 files changed, 30 insertions, 17 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)" diff --git a/templates/interfaces/ethernet/node.tag/bridge-group/node.def b/templates/interfaces/ethernet/node.tag/bridge-group/node.def index 0ac61a19..0f4e9b2c 100644 --- a/templates/interfaces/ethernet/node.tag/bridge-group/node.def +++ b/templates/interfaces/ethernet/node.tag/bridge-group/node.def @@ -1,15 +1,20 @@ -help: Set this interface to a bridge group -commit:expression: $VAR(./bridge/) != ""; "Must set the bridge interface" -create:expression: "sudo brctl addif $VAR(./bridge/@) $VAR(../@)" -delete:expression: "touch /tmp/eth-$VAR(../@)-bridge.$PPID" -end:expression: "\ - if [ -f \"/tmp/eth-$VAR(../@)-bridge.$PPID\" ]; then \ - rm -f /tmp/eth-$VAR(../@)-bridge.$PPID; \ - else \ - if [ -n \"$VAR(./cost/@)\" ]; then \ - sudo brctl setpathcost $VAR(./bridge/@) $VAR(../@) $VAR(./cost/@); \ - fi; \ - if [ -n \"$VAR(./priority/@)\" ]; then \ - sudo brctl setportprio $VAR(./bridge/@) $VAR(../@) $VAR(./priority/@); \ - fi; \ - fi; " +help: Add this interface to a bridge group + +create: sudo brctl addif $VAR(./bridge/@) $VAR(../@); + +delete: touch /tmp/eth-$VAR(../@)-bridge.$PPID; + +end: if [ -f "/tmp/eth-$VAR(../@)-bridge.$PPID" ]; then + rm -f /tmp/eth-$VAR(../@)-bridge.$PPID; + else + if [ -z "$VAR(./bridge/@)" ]; then + echo "Must set the bridge interface"; + exit 1; + fi; + if [ -n "$VAR(./cost/@)" ]; then + sudo brctl setpathcost $VAR(./bridge/@) $VAR(../@) $VAR(./cost/@); + fi; + if [ -n "$VAR(./priority/@)" ]; then + sudo brctl setportprio $VAR(./bridge/@) $VAR(../@) $VAR(./priority/@); + fi; + fi; |