diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-07-19 13:26:48 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-07-19 13:26:48 -0700 |
| commit | b3aef2e0a16a04f1c97609142784e4681b5e7087 (patch) | |
| tree | 75c06b15870893a901d8a3d5be376808ff6c0292 | |
| parent | a04026859c8a16d00a41403a6138eb56cde5d489 (diff) | |
| parent | 7a090934b301ab9b0168818c61bf41132044dfd5 (diff) | |
| download | vyatta-cfg-system-b3aef2e0a16a04f1c97609142784e4681b5e7087.tar.gz vyatta-cfg-system-b3aef2e0a16a04f1c97609142784e4681b5e7087.zip | |
Merge branch 'larkspur' of suva.vyatta.com:/git/vyatta-cfg-system into larkspur
4 files changed, 7 insertions, 1 deletions
diff --git a/templates/interfaces/loopback/node.tag/address/node.def b/templates/interfaces/loopback/node.tag/address/node.def index 814ddad6..ed3ab807 100644 --- a/templates/interfaces/loopback/node.tag/address/node.def +++ b/templates/interfaces/loopback/node.tag/address/node.def @@ -1,5 +1,7 @@ multi: type: ipv4net,ipv6net +val_help: IPv4 address and prefix length +val_help: IPv6 address and prefix length help: IP address syntax:expression: exec "/opt/vyatta/sbin/vyatta-interfaces.pl --valid-addr-set $VAR(@) --dev $VAR(../@)"; \ diff --git a/templates/interfaces/tunnel/node.tag/address/node.def b/templates/interfaces/tunnel/node.tag/address/node.def index f9c5bd74..c8826b6a 100644 --- a/templates/interfaces/tunnel/node.tag/address/node.def +++ b/templates/interfaces/tunnel/node.tag/address/node.def @@ -1,5 +1,7 @@ multi: type: ipv4net,ipv6net +val_help: IPv4 address and prefix length +val_help: IPv6 address and prefix length help: IP address syntax:expression: exec "/opt/vyatta/sbin/vyatta-interfaces.pl --valid-addr $VAR(@) --dev $VAR(../@)"; "Invalid IP address/prefix [$VAR(@)] for interface $VAR(../@)" diff --git a/templates/system/login/user/node.tag/authentication/public-keys/node.def b/templates/system/login/user/node.tag/authentication/public-keys/node.def index d4670e39..245e7197 100644 --- a/templates/system/login/user/node.tag/authentication/public-keys/node.def +++ b/templates/system/login/user/node.tag/authentication/public-keys/node.def @@ -1,7 +1,7 @@ tag: type: txt help: Remote access public keys -val_help: key identifier used by ssh-keygen (usually of form user@host) +val_help: Key identifier used by ssh-keygen (usually of form user@host) commit:expression: $VAR(./type/) != "" ; \ "Must configure public key type for $VAR(@)" diff --git a/templates/system/static-host-mapping/host-name/node.tag/inet/node.def b/templates/system/static-host-mapping/host-name/node.tag/inet/node.def index d6c0b466..d8bc35bd 100644 --- a/templates/system/static-host-mapping/host-name/node.tag/inet/node.def +++ b/templates/system/static-host-mapping/host-name/node.tag/inet/node.def @@ -1,2 +1,4 @@ type: ipv4, ipv6 +val_help: IPv4 address +val_help: IPv6 address help: Address [REQUIRED] |