diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-07-21 13:44:29 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-07-21 13:44:29 -0700 |
| commit | b2324eadd20e48aa4c0d561aa55915b1c8e37336 (patch) | |
| tree | 51617f3e0ddc2bbf8ff9ae14680b9ea269a2d489 /templates/interfaces | |
| parent | 67bfa56674b29993a187185d88593bbd533b5403 (diff) | |
| download | vyatta-cfg-system-b2324eadd20e48aa4c0d561aa55915b1c8e37336.tar.gz vyatta-cfg-system-b2324eadd20e48aa4c0d561aa55915b1c8e37336.zip | |
Fix help completion text
Use ipv4net when Address/prefix expected
Use ipv4 where Address expected
Diffstat (limited to 'templates/interfaces')
6 files changed, 12 insertions, 12 deletions
diff --git a/templates/interfaces/bonding/node.tag/address/node.def b/templates/interfaces/bonding/node.tag/address/node.def index 8701d134..624eab49 100644 --- a/templates/interfaces/bonding/node.tag/address/node.def +++ b/templates/interfaces/bonding/node.tag/address/node.def @@ -6,7 +6,7 @@ syntax:expression: exec "/opt/vyatta/sbin/vyatta-interfaces.pl --valid-addr $VAR create:sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-update $VAR(@) --dev $VAR(../@) delete:sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-delete $VAR(@) --dev $VAR(../@) allowed: echo "dhcp <>" -val_help: ipv4; IP address and prefix length -val_help: ipv6; IPv6 address and prefix length +val_help: ipv4net; IP address and prefix length +val_help: ipv6net; IPv6 address and prefix length val_help: dhcp; Dynamic Host Configuration Protocol diff --git a/templates/interfaces/bridge/node.tag/address/node.def b/templates/interfaces/bridge/node.tag/address/node.def index 699554e2..4644ad8d 100644 --- a/templates/interfaces/bridge/node.tag/address/node.def +++ b/templates/interfaces/bridge/node.tag/address/node.def @@ -17,6 +17,6 @@ delete: sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-delete $VAR(@) --dev $VAR(../@) fi allowed: echo "dhcp <>" -val_help: ipv4; IP address and prefix length -val_help: ipv6; IPv6 address and prefix length +val_help: ipv4net; IP address and prefix length +val_help: ipv6net; IPv6 address and prefix length val_help: dhcp; Dynamic Host Configuration Protocol diff --git a/templates/interfaces/ethernet/node.tag/address/node.def b/templates/interfaces/ethernet/node.tag/address/node.def index 8cdd27db..2395563c 100644 --- a/templates/interfaces/ethernet/node.tag/address/node.def +++ b/templates/interfaces/ethernet/node.tag/address/node.def @@ -48,7 +48,7 @@ delete: allowed: echo "dhcp dhcpv6 <>" -val_help: ipv4; IP address and prefix length -val_help: ipv6; IPv6 address and prefix length +val_help: ipv4net; IP address and prefix length +val_help: ipv6net; IPv6 address and prefix length val_help: dhcp; Dynamic Host Configuration Protocol val_help: dhcpv6; Dynamic Host Configuration Protocol for IPv6 diff --git a/templates/interfaces/loopback/node.tag/address/node.def b/templates/interfaces/loopback/node.tag/address/node.def index ed3ab807..969ecf26 100644 --- a/templates/interfaces/loopback/node.tag/address/node.def +++ b/templates/interfaces/loopback/node.tag/address/node.def @@ -1,7 +1,7 @@ multi: type: ipv4net,ipv6net -val_help: IPv4 address and prefix length -val_help: IPv6 address and prefix length +val_help: ipv4net; IPv4 address and prefix length +val_help: ipv6net; 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/pseudo-ethernet/node.tag/address/node.def b/templates/interfaces/pseudo-ethernet/node.tag/address/node.def index 46ae1b69..42e79606 100644 --- a/templates/interfaces/pseudo-ethernet/node.tag/address/node.def +++ b/templates/interfaces/pseudo-ethernet/node.tag/address/node.def @@ -7,7 +7,7 @@ create:sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-update $VAR(@) --de delete:sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-delete $VAR(@) --dev $VAR(../@) allowed: echo "dhcp <>" -val_help: ipv4; IP address and prefix length -val_help: ipv6; IPv6 address and prefix length +val_help: ipv4net; IP address and prefix length +val_help: ipv6net; IPv6 address and prefix length val_help: dhcp; Dynamic Host Configuration Protocol diff --git a/templates/interfaces/tunnel/node.tag/address/node.def b/templates/interfaces/tunnel/node.tag/address/node.def index c8826b6a..6cd40ece 100644 --- a/templates/interfaces/tunnel/node.tag/address/node.def +++ b/templates/interfaces/tunnel/node.tag/address/node.def @@ -1,7 +1,7 @@ multi: type: ipv4net,ipv6net -val_help: IPv4 address and prefix length -val_help: IPv6 address and prefix length +val_help: ipv4net; IPv4 address and prefix length +val_help: ipv6net; 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(../@)" |