diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-03-25 13:25:54 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-03-25 13:25:54 -0700 |
| commit | cafbb4f20e6863e87bd98a493dc739b8f4eaf899 (patch) | |
| tree | 124fb99cd3ad02b2b626dda540810ffd31afedb9 /templates/interfaces | |
| parent | fd605ab5d4ce4aa4015089042afd90f6e5c6ba59 (diff) | |
| parent | c5dbaa28cca4baa2404911a0b021768e34f0dd09 (diff) | |
| download | vyatta-cfg-quagga-cafbb4f20e6863e87bd98a493dc739b8f4eaf899.tar.gz vyatta-cfg-quagga-cafbb4f20e6863e87bd98a493dc739b8f4eaf899.zip | |
Merge branch 'jenner' of suva.vyatta.com:/git/vyatta-cfg-system into jenner
Diffstat (limited to 'templates/interfaces')
| -rw-r--r-- | templates/interfaces/ethernet/node.tag/bridge-group/bridge/node.def | 2 | ||||
| -rw-r--r-- | templates/interfaces/tunnel/node.tag/local-ip/node.def | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/templates/interfaces/ethernet/node.tag/bridge-group/bridge/node.def b/templates/interfaces/ethernet/node.tag/bridge-group/bridge/node.def index 1a6cf437..3e562f7f 100644 --- a/templates/interfaces/ethernet/node.tag/bridge-group/bridge/node.def +++ b/templates/interfaces/ethernet/node.tag/bridge-group/bridge/node.def @@ -1,6 +1,6 @@ type: txt help: Set this interface to a bridge-group -syntax:expression: exec \ +commit:expression: exec \ "/opt/vyatta/sbin/vyatta-interfaces.pl --dev=$VAR(@) --check=bridge" allowed: /opt/vyatta/sbin/vyatta-interfaces.pl --show=bridge delete: echo $VAR(@) > /tmp/bridge-no.$PPID diff --git a/templates/interfaces/tunnel/node.tag/local-ip/node.def b/templates/interfaces/tunnel/node.tag/local-ip/node.def index 9f9d52c0..0780210d 100644 --- a/templates/interfaces/tunnel/node.tag/local-ip/node.def +++ b/templates/interfaces/tunnel/node.tag/local-ip/node.def @@ -1,8 +1,8 @@ type: ipv4 help: Set the local IP address for this tunnel -syntax:expression: exec "if [ -z \"`ip addr list | grep $VAR(@) `\" ]; then \ - echo IP address $VAR(@) doesn\\'t exist on this system ; \ - exit 1 ; \ +commit:expression: exec "if [ -z \"`ip addr list | grep $VAR(@) `\" ]; then \ + echo IP address $VAR(@) doesn\\'t exist on this system ; \ + exit 1 ; \ fi ; " create:expression: "true" update:expression: "false" ; \ |