summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2011-01-26 10:52:46 +1000
committerStephen Hemminger <stephen.hemminger@vyatta.com>2011-01-25 17:00:01 -0800
commit60ec9dfcf7c1ddc0f23f540570637db50a49809c (patch)
treeb74de6b4e23c1ac3934efdf999f0a4a2f7044274 /templates
parent47a2452f92a33aadc26ba5b591c96cfe81482a9b (diff)
downloadvyatta-cfg-quagga-60ec9dfcf7c1ddc0f23f540570637db50a49809c.tar.gz
vyatta-cfg-quagga-60ec9dfcf7c1ddc0f23f540570637db50a49809c.zip
Rearrange priority for pseudo-ethernet
Bug 6116 Do setup at same priority as VIF (since it is really macvlan) Do address after peth mac address is set. (cherry picked from commit 0f3aa38c15bb159d331dcfd91076ac37bd4c524e)
Diffstat (limited to 'templates')
-rw-r--r--templates/interfaces/pseudo-ethernet/node.def2
-rw-r--r--templates/interfaces/pseudo-ethernet/node.tag/address/node.def1
2 files changed, 2 insertions, 1 deletions
diff --git a/templates/interfaces/pseudo-ethernet/node.def b/templates/interfaces/pseudo-ethernet/node.def
index 2d2da19f..5b0aaac9 100644
--- a/templates/interfaces/pseudo-ethernet/node.def
+++ b/templates/interfaces/pseudo-ethernet/node.def
@@ -1,5 +1,5 @@
tag:
-priority: 390
+priority: 319 # same as vif
type: txt
help: Pseudo Ethernet device name
val_help: <pethN>; Pseudo Ethernet interface name
diff --git a/templates/interfaces/pseudo-ethernet/node.tag/address/node.def b/templates/interfaces/pseudo-ethernet/node.tag/address/node.def
index d2812446..253c4775 100644
--- a/templates/interfaces/pseudo-ethernet/node.tag/address/node.def
+++ b/templates/interfaces/pseudo-ethernet/node.tag/address/node.def
@@ -1,5 +1,6 @@
multi:
type: txt
+priority: 320 # After peth device is initialized
help: IP address
syntax:expression: exec "/opt/vyatta/sbin/valid_address $VAR(@)"