summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Hemminger <shemminger@vyatta.com>2011-11-03 11:19:21 -0700
committerStephen Hemminger <shemminger@vyatta.com>2011-11-03 11:19:21 -0700
commiteb000438a66e37f09dbaacc4f403fb9ec25b69bb (patch)
tree8f0e5ff3a97f72d97f8aca8d785ebb64d0d9ebb2
parent35217ff643894ccc06aca1aabbf1e50264efde6a (diff)
downloadvyatta-cfg-quagga-eb000438a66e37f09dbaacc4f403fb9ec25b69bb.tar.gz
vyatta-cfg-quagga-eb000438a66e37f09dbaacc4f403fb9ec25b69bb.zip
Fix priority of vif for pseudo-ethernet
-rw-r--r--templates/interfaces/pseudo-ethernet/node.tag/vif/node.def13
1 files changed, 3 insertions, 10 deletions
diff --git a/templates/interfaces/pseudo-ethernet/node.tag/vif/node.def b/templates/interfaces/pseudo-ethernet/node.tag/vif/node.def
index 17d73685..2c73ca16 100644
--- a/templates/interfaces/pseudo-ethernet/node.tag/vif/node.def
+++ b/templates/interfaces/pseudo-ethernet/node.tag/vif/node.def
@@ -1,19 +1,12 @@
tag:
-priority: 319
+priority: 320
type: u32
help: Virtual Local Area Network (VLAN) ID
syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 4094; "VLAN ID must be between 0 and 4094"
val_help: u32:0-4094; VLAN ID
-create:
- if ! ip link add link $VAR(../@) name "$VAR(../@).$VAR(@)" type vlan id $VAR(@)
- then echo "Error creating VLAN device $VAR(../@).$VAR(@)"
- exit 1
- fi
- # if parent is up, then bring VLAN up
- if [ $(( $(cat /sys/class/net/$VAR(../@)/flags) & 1 )) -eq 1 ]
- then ip link set "$VAR(../@).$VAR(@)" up
- fi
+create: ip link add link $VAR(../@) name "$VAR(../@).$VAR(@)" type vlan id $VAR(@) || exit 1
+ ip link set "$VAR(../@).$VAR(@)" up
/opt/vyatta/sbin/vyatta-link-detect "$VAR(../@).$VAR(@)" on
delete: [ -d /sys/class/net/$VAR(../@).$VAR(@) ] || exit 0