diff options
| author | Mohit Mehta <mohit.mehta@vyatta.com> | 2008-07-25 14:57:08 +0000 |
|---|---|---|
| committer | Mohit Mehta <mohit.mehta@vyatta.com> | 2008-07-25 14:57:08 +0000 |
| commit | c4035aa5d0601eaa2a64d67ca70326f4de3873e8 (patch) | |
| tree | dfd5e96ba143d2d4bf1b8464c16bafa7c353fa91 /templates | |
| parent | 062638fb818c5632581f25f503684335b094be04 (diff) | |
| parent | 189dd8d9a5a467aea193aa5ce9e35c0ca14f7b91 (diff) | |
| download | vyatta-cfg-system-c4035aa5d0601eaa2a64d67ca70326f4de3873e8.tar.gz vyatta-cfg-system-c4035aa5d0601eaa2a64d67ca70326f4de3873e8.zip | |
Merge branch 'islavista' of mohit@git.vyatta.com:/git/vyatta-cfg-system into islavista
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/interfaces/bridge/node.tag/address/node.def | 3 | ||||
| -rw-r--r-- | templates/interfaces/tunnel/node.tag/address/node.def | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/templates/interfaces/bridge/node.tag/address/node.def b/templates/interfaces/bridge/node.tag/address/node.def index 52188386..3f04ec06 100644 --- a/templates/interfaces/bridge/node.tag/address/node.def +++ b/templates/interfaces/bridge/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 - dhcp\t\t\t\tSet the IP address and prefix length via DHCP + <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/tunnel/node.tag/address/node.def b/templates/interfaces/tunnel/node.tag/address/node.def index 07ea4a0e..3310ee00 100644 --- a/templates/interfaces/tunnel/node.tag/address/node.def +++ b/templates/interfaces/tunnel/node.tag/address/node.def @@ -9,4 +9,5 @@ update:expression: "sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-update delete:expression: "sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-delete $VAR(@) --dev $VAR(../@)"; "Error deleting address $VAR(@) on interface $VAR(../@)" comp_help:Possible completions: - <x.x.x.x/x> Set the IP address and prefix length + <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 |