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 | |
| parent | 1979d595efbccf4abe793ee29ad3f11848951887 (diff) | |
| parent | 71a341bf28c91c48d0e19bf077373a3f3113e4e8 (diff) | |
| download | vyatta-cfg-system-be02913ee7f3e0e79e98a44c27e62509971ea501.tar.gz vyatta-cfg-system-be02913ee7f3e0e79e98a44c27e62509971ea501.zip | |
Merge branch 'jenner' of suva.vyatta.com:/git/vyatta-cfg-system into jenner
| -rw-r--r-- | debian/changelog | 6 | ||||
| -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 |
3 files changed, 10 insertions, 9 deletions
diff --git a/debian/changelog b/debian/changelog index 4aa8adc3..182bcc8b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +vyatta-cfg-system (0.15.16) unstable; urgency=low + + * Change "syntax" check to "commit" check for virtual interfaces. + + -- Stig Thormodsrud <stig@vyatta.com> Wed, 01 Apr 2009 16:27:35 -0700 + vyatta-cfg-system (0.15.15) unstable; urgency=low * Don't double log quagga messages 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(../@) |