diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-07-16 15:05:01 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2010-07-16 17:29:18 -0700 |
| commit | 1a86e15787cdda44b8702895bb97acf107ef3a07 (patch) | |
| tree | b818c3aaa6440dc9d344e3377bdda358367137e0 /templates | |
| parent | c317fda4786d93e9cdf94deb1e52c5d581360b7e (diff) | |
| download | vyatta-cfg-system-1a86e15787cdda44b8702895bb97acf107ef3a07.tar.gz vyatta-cfg-system-1a86e15787cdda44b8702895bb97acf107ef3a07.zip | |
Use val_help: for address nodes
Use common format for address nodes
Diffstat (limited to 'templates')
6 files changed, 19 insertions, 26 deletions
diff --git a/templates/interfaces/bonding/node.tag/address/node.def b/templates/interfaces/bonding/node.tag/address/node.def index 20c05453..7221232e 100644 --- a/templates/interfaces/bonding/node.tag/address/node.def +++ b/templates/interfaces/bonding/node.tag/address/node.def @@ -6,8 +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 <>" -comp_help:Possible completions: - <x.x.x.x/x> Set the IP address and prefix length - <h:h:h:h:h:h:h:h/x> Set the IPv6 address and prefix length - dhcp Set the IP address and prefix length via DHCP +val_help:<x.x.x.x/x>; IP address and prefix length +val_help:<h:h:h:h:h:h:h:h/x>; IPv6 address and prefix length +val_help:dhcp; Dynamic Host Configuration Protocol diff --git a/templates/interfaces/bonding/node.tag/vif/node.tag/address/node.def b/templates/interfaces/bonding/node.tag/vif/node.tag/address/node.def index 921eaa10..f48d4d5b 100644 --- a/templates/interfaces/bonding/node.tag/vif/node.tag/address/node.def +++ b/templates/interfaces/bonding/node.tag/vif/node.tag/address/node.def @@ -6,7 +6,6 @@ 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(../../@).$VAR(../@) delete:sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-delete $VAR(@) --dev $VAR(../../@).$VAR(../@) allowed: echo "dhcp <>" -comp_help:Possible completions: - <x.x.x.x/x> Set the IP address and prefix length - <h:h:h:h:h:h:h:h/x> Set the IPv6 address and prefix length - dhcp Set the IP address and prefix length via DHCP +val_help:<x.x.x.x/x>; IP address and prefix length +val_help:<h:h:h:h:h:h:h:h/x>; 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 7278df30..7a9382b7 100644 --- a/templates/interfaces/bridge/node.tag/address/node.def +++ b/templates/interfaces/bridge/node.tag/address/node.def @@ -17,8 +17,6 @@ delete: sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-delete $VAR(@) --dev $VAR(../@) fi allowed: echo "dhcp <>" -comp_help:Possible completions: - <x.x.x.x/x> Set the IP address and prefix length - <h:h:h:h:h:h:h:h/x> Set the IPv6 address and prefix length - dhcp Set the IP address and prefix length via DHCP - +val_help:<x.x.x.x/x>; IP address and prefix length +val_help:<h:h:h:h:h:h:h:h/x>; 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 7ed12bba..f503b174 100644 --- a/templates/interfaces/ethernet/node.tag/address/node.def +++ b/templates/interfaces/ethernet/node.tag/address/node.def @@ -48,8 +48,7 @@ delete: allowed: echo "dhcp dhcpv6 <>" -comp_help:Possible completions: - <x.x.x.x/x> Set the IPv4 address and prefix length - <h:h:h:h:h:h:h:h/x> Set the IPv6 address and prefix length - dhcp Set the IPv4 address and prefix length via DHCP - dhcpv6 Set the IPv6 address and prefix length via DHCPv6 +val_help:<x.x.x.x/x>; IP address and prefix length +val_help:<h:h:h:h:h:h:h:h/x>; 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/ethernet/node.tag/vif/node.tag/address/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/address/node.def index a5edef6d..1e8b2f46 100644 --- a/templates/interfaces/ethernet/node.tag/vif/node.tag/address/node.def +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/address/node.def @@ -21,7 +21,6 @@ delete:sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-delete $VAR(@) --de allowed: echo "dhcp <>" -comp_help:Possible completions: - <x.x.x.x/x> Set the IP address and prefix length - <h:h:h:h:h:h:h:h/x> Set the IPv6 address and prefix length - dhcp Set the IP address and prefix length via DHCP +val_help:<x.x.x.x/x>; IP address and prefix length +val_help:<h:h:h:h:h:h:h:h/x>; IPv6 address and prefix length +val_help:dhcp; Dynamic Host Configuration Protocol diff --git a/templates/interfaces/pseudo-ethernet/node.tag/address/node.def b/templates/interfaces/pseudo-ethernet/node.tag/address/node.def index 20c05453..7221232e 100644 --- a/templates/interfaces/pseudo-ethernet/node.tag/address/node.def +++ b/templates/interfaces/pseudo-ethernet/node.tag/address/node.def @@ -6,8 +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 <>" -comp_help:Possible completions: - <x.x.x.x/x> Set the IP address and prefix length - <h:h:h:h:h:h:h:h/x> Set the IPv6 address and prefix length - dhcp Set the IP address and prefix length via DHCP +val_help:<x.x.x.x/x>; IP address and prefix length +val_help:<h:h:h:h:h:h:h:h/x>; IPv6 address and prefix length +val_help:dhcp; Dynamic Host Configuration Protocol |