diff options
| author | Jon Andersson <jon.andersson@thalesgroup.com> | 2012-03-27 08:17:07 -0700 |
|---|---|---|
| committer | John Southworth <john.southworth@vyatta.com> | 2012-03-27 08:17:07 -0700 |
| commit | 06ddf1529db83159b60a7d211270076e9f932900 (patch) | |
| tree | fc2135492f0e6e3a439e818fa510c70ae4c93c6f | |
| parent | 993ee4fdb1b8ad04bb7baa32633d11ea2661bedc (diff) | |
| download | vyatta-cfg-system-06ddf1529db83159b60a7d211270076e9f932900.tar.gz vyatta-cfg-system-06ddf1529db83159b60a7d211270076e9f932900.zip | |
Bugfix 7976: Move the test to update: to allow addresses to be configured
| -rw-r--r-- | templates/interfaces/tunnel/node.tag/local-ip/node.def | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/templates/interfaces/tunnel/node.tag/local-ip/node.def b/templates/interfaces/tunnel/node.tag/local-ip/node.def index 5733605a..e393f35c 100644 --- a/templates/interfaces/tunnel/node.tag/local-ip/node.def +++ b/templates/interfaces/tunnel/node.tag/local-ip/node.def @@ -3,11 +3,12 @@ help: Local IP address for this tunnel [REQUIRED] val_help: ipv4; Local IPv4 address for this tunnel [REQUIRED] val_help: ipv6; Local IPv6 address for this tunnel [REQUIRED] -syntax:expression: exec \ - "/opt/vyatta/sbin/local_ip $VAR(@) || \ - echo Warning! IP address $VAR(@) doesn\\'t exist on this system" +update:if ! /opt/vyatta/sbin/local_ip $VAR(@) + then + echo Warning! IP address $VAR(@) does not exist on this system + fi -update:case "$VAR(../encapsulation/@)" in + case "$VAR(../encapsulation/@)" in "gre-bridge") ;; "gre" | "ipip" | "sit") |