summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorStig Thormodsrud <stig@vyatta.com>2008-01-21 16:40:18 -0800
committerStig Thormodsrud <stig@vyatta.com>2008-01-21 16:40:18 -0800
commite9802462f494208cc8469013a69be306e40a4929 (patch)
tree9198820c18b209de77cf439c16c85121aad9e5ca /templates
parentaafe4960be8583a95c5961a8a13142abd70a7627 (diff)
downloadvyatta-cfg-e9802462f494208cc8469013a69be306e40a4929.tar.gz
vyatta-cfg-e9802462f494208cc8469013a69be306e40a4929.zip
Fix vlan nodes to use create instead of update
Diffstat (limited to 'templates')
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.def8
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.tag/address/node.def9
2 files changed, 11 insertions, 6 deletions
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.def b/templates/interfaces/ethernet/node.tag/vif/node.def
index f1edff6..cd2eb0b 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.def
@@ -2,7 +2,9 @@ tag:
type: u32
help: "VLAN ID"
syntax: $(@) >= 0 && $(@) <= 4095; "VLAN ID must be between 0 and 4095"
-update: "sudo modprobe 8021q"; "Error loading 802.1q driver"
-update: "sudo vconfig add $(../@) $(@)"; "Error adding VLAN id $(@) to dev $(../@)"
-update: "sudo ip link set $(../@).$(@) up"; "Error enabling VLAN id $(@) on dev $(../@)"
+create: "sudo modprobe 8021q"; "Error loading 802.1q driver"
+create: "sudo vconfig add $(../@) $(@)"; "Error adding VLAN id $(@) to dev $(../@)"
+create: "sudo ip link set $(../@).$(@) up"; "Error enabling VLAN id $(@) on dev $(../@)"
delete: "sudo vconfig rem $(../@).$(@)"; "Error removing VLAN id $(@) from dev $(../@)"
+#comp_help: possible completions:
+# <0-4095> Set VLAN ID
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 a3c0b5c..ec1d252 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
@@ -1,6 +1,9 @@
multi:
type: txt
-help: "Set IPv4 address and prefix for this vif interface"
-syntax: exec "/opt/vyatta/sbin/vyatta-interfaces.pl --valid-addr $(@) --dev $(../../@).$(../@) "
-create: "sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-update $(@) --dev $(../../@).$(../@) "; "Error setting address $(@) on dev $(../../@) $(../@) "
+help: "Configure an IP address for this interface"
+syntax: exec "/opt/vyatta/sbin/vyatta-interfaces.pl --valid-addr $(@) --dev $(../../@).$(../@) "; "Invalid IP address/prefix [$(@)] for interface $(../../@).$(../@)"
+create: "sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-update $(@) --dev $(../../@).$(../@) "; "Error setting address $(@) on dev $(../../@).$(../@) "
delete: "sudo /opt/vyatta/sbin/vyatta-interfaces.pl --eth-addr-delete $(@) --dev $(../../@).$(../@) "; "Error deleting address $(@) on dev $(../../@).$(../@) "
+#comp_help:Possible completions:
+# <IP address>/<prefix length> Set the IP address and prefix length
+# dhcp Set the IP address and prefix length via DHCP