diff options
| author | John Southworth <john.southworth@vyatta.com> | 2013-04-12 09:24:13 -0700 |
|---|---|---|
| committer | John Southworth <john.southworth@vyatta.com> | 2013-04-12 09:25:57 -0700 |
| commit | 7c228870dffda42d581e34522395d45872b3b098 (patch) | |
| tree | ac9144271efca51377c3d4ff2a67fc9cf0ea23b6 | |
| parent | a8bd5fc3644b2daa4fb01a724a2fd8d37f7b46ed (diff) | |
| download | vyatta-cfg-system-7c228870dffda42d581e34522395d45872b3b098.tar.gz vyatta-cfg-system-7c228870dffda42d581e34522395d45872b3b098.zip | |
Bugfix 8526: don't use REQUIRED on remote-ip
Having the word REQUIRED in the string is enough to break the webgui, remove it entirely
| -rw-r--r-- | templates/interfaces/tunnel/node.tag/remote-ip/node.def | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/templates/interfaces/tunnel/node.tag/remote-ip/node.def b/templates/interfaces/tunnel/node.tag/remote-ip/node.def index eb4694c6..6da2fb4d 100644 --- a/templates/interfaces/tunnel/node.tag/remote-ip/node.def +++ b/templates/interfaces/tunnel/node.tag/remote-ip/node.def @@ -1,7 +1,8 @@ type: ipv4, ipv6 -help: Remote IP address for this tunnel [REQUIRED for all encapsulation types except gre-multipoint] -val_help: ipv4; Remote IPv4 address for this tunnel [REQUIRED for all encapsulation types except gre-multipoint] -val_help: ipv6; Remote IPv6 address for this tunnel [REQUIRED for all encapsulation types except gre-multipoint] +help: Remote IP address for this tunnel +val_help: ipv4; Remote IPv4 address for this tunnel +val_help: ipv6; Remote IPv6 address for this tunnel +>>>>>>> b2159cb... Bugfix 8526: don't use REQUIRED on remote-ip update:case "$VAR(../encapsulation/@)" in "gre-bridge") |