summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2009-03-02 16:22:21 -0800
committerStephen Hemminger <stephen.hemminger@vyatta.com>2009-03-02 16:22:21 -0800
commite44b3df7accd515bc1cfab8341f9eed5b84e9fa3 (patch)
tree86ea8c0089fbb92005be86da7acd74a4728c0a8b
parent095f0eb743438ad27d5fd970d6834c1b05d11071 (diff)
parent2840eb48231ca4fccfa49436002f968c0ef0e3c8 (diff)
downloadvyatta-cfg-e44b3df7accd515bc1cfab8341f9eed5b84e9fa3.tar.gz
vyatta-cfg-e44b3df7accd515bc1cfab8341f9eed5b84e9fa3.zip
Merge branch 'jenner' of 192.168.100.1:git/vyatta-cfg into jenner
-rw-r--r--templates/interfaces/ethernet/node.tag/vif/node.def5
1 files changed, 2 insertions, 3 deletions
diff --git a/templates/interfaces/ethernet/node.tag/vif/node.def b/templates/interfaces/ethernet/node.tag/vif/node.def
index b86a89c..2166f80 100644
--- a/templates/interfaces/ethernet/node.tag/vif/node.def
+++ b/templates/interfaces/ethernet/node.tag/vif/node.def
@@ -2,10 +2,9 @@ tag:
type: u32
help: Set Virtual Local Area Network (VLAN) ID
syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 4094; "VLAN ID must be between 0 and 4094"
-create: sudo modprobe 8021q
- sudo vconfig add "$VAR(../@)" "$VAR(@)"
+create: sudo ip link add link $VAR(../@) name "$VAR(../@).$VAR(@)" type vlan id $VAR(@)
sudo ip link set "$VAR(../@).$VAR(@)" up
/opt/vyatta/sbin/vyatta-link-detect "$VAR(../@).$VAR(@)" on
-delete: sudo vconfig rem "$VAR(../@).$VAR(@)"
+delete: sudo ip link delete link "$VAR(../@).$VAR(@)" type vlan id $VAR(@)
comp_help: possible completions:
<0-4094> Set VLAN ID