From 06ddf1529db83159b60a7d211270076e9f932900 Mon Sep 17 00:00:00 2001 From: Jon Andersson Date: Tue, 27 Mar 2012 08:17:07 -0700 Subject: Bugfix 7976: Move the test to update: to allow addresses to be configured --- templates/interfaces/tunnel/node.tag/local-ip/node.def | 9 +++++---- 1 file 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") -- cgit v1.2.3