diff options
author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-07-29 15:53:49 -0700 |
---|---|---|
committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-07-29 15:53:49 -0700 |
commit | 51dabae40799358785a147b3447b7075e7fae22b (patch) | |
tree | f0eb1f6b3c224edfb794443f9b9ba19d650157c4 /templates | |
parent | 5cfca8801a52bf8e9421417f82a4cee6cfe8653e (diff) | |
parent | e1cc907f3e29bfedf123c28da24d45f187198ece (diff) | |
download | vyatta-cfg-51dabae40799358785a147b3447b7075e7fae22b.tar.gz vyatta-cfg-51dabae40799358785a147b3447b7075e7fae22b.zip |
Merge branch 'islavista' of suva.vyatta.com:/git/vyatta-cfg into islavista
Diffstat (limited to 'templates')
3 files changed, 3 insertions, 0 deletions
diff --git a/templates/interfaces/ethernet/node.tag/address/node.def b/templates/interfaces/ethernet/node.tag/address/node.def index 0ff02c8..d523793 100644 --- a/templates/interfaces/ethernet/node.tag/address/node.def +++ b/templates/interfaces/ethernet/node.tag/address/node.def @@ -7,5 +7,6 @@ delete:expression: "sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-delete 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 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 cb9cedc..625130a 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 @@ -7,4 +7,5 @@ delete:expression: "sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-delete 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 diff --git a/templates/interfaces/loopback/node.tag/address/node.def b/templates/interfaces/loopback/node.tag/address/node.def index 03ead09..9faf664 100644 --- a/templates/interfaces/loopback/node.tag/address/node.def +++ b/templates/interfaces/loopback/node.tag/address/node.def @@ -12,3 +12,4 @@ delete:expression: "sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-delete 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 |