diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-04-01 16:46:03 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-04-01 16:46:03 -0700 |
| commit | be02913ee7f3e0e79e98a44c27e62509971ea501 (patch) | |
| tree | fa87f9b7f652df81187fa646a5f361bdb51c9c58 /templates | |
| parent | 1979d595efbccf4abe793ee29ad3f11848951887 (diff) | |
| parent | 71a341bf28c91c48d0e19bf077373a3f3113e4e8 (diff) | |
| download | vyatta-cfg-quagga-be02913ee7f3e0e79e98a44c27e62509971ea501.tar.gz vyatta-cfg-quagga-be02913ee7f3e0e79e98a44c27e62509971ea501.zip | |
Merge branch 'jenner' of suva.vyatta.com:/git/vyatta-cfg-system into jenner
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/interfaces/bonding/node.tag/bridge-group/bridge/node.def | 11 | ||||
| -rw-r--r-- | templates/interfaces/ethernet/node.tag/bond-group/node.def | 2 |
2 files changed, 4 insertions, 9 deletions
diff --git a/templates/interfaces/bonding/node.tag/bridge-group/bridge/node.def b/templates/interfaces/bonding/node.tag/bridge-group/bridge/node.def index 79609a86..dc958dd5 100644 --- a/templates/interfaces/bonding/node.tag/bridge-group/bridge/node.def +++ b/templates/interfaces/bonding/node.tag/bridge-group/bridge/node.def @@ -1,11 +1,6 @@ type: txt help: Set this interface to a bridge-group -syntax:expression: exec " \ - if [ -z \"`sudo brctl show | grep $VAR(@) `\" ]; then \ - echo bridge interface $VAR(@) doesn\\'t exist on this system ; \ - exit 1 ; \ - fi ; " +commit:expression: exec \ + "/opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(@) --check=bridge" delete: echo $VAR(@) > /tmp/bridge-no.$PPID -allowed: local -a array ; - array=( /sys/class/net/br* ) ; - echo -n ${array[@]##*/} +allowed: /opt/vyatta/sbin/vyatta-interfaces.pl --show=bridge diff --git a/templates/interfaces/ethernet/node.tag/bond-group/node.def b/templates/interfaces/ethernet/node.tag/bond-group/node.def index ea1b63eb..2109b5ac 100644 --- a/templates/interfaces/ethernet/node.tag/bond-group/node.def +++ b/templates/interfaces/ethernet/node.tag/bond-group/node.def @@ -1,6 +1,6 @@ type: txt help: Add this interface to a bonding group -syntax:expression: exec \ +commit:expression: exec \ "/opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(@) --check=bonding" allowed: /opt/vyatta/sbin/vyatta-interfaces.pl --show=bonding create: sudo ifenslave $VAR(@) $VAR(../@) |