summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorStephen Hemminger <stephen.hemminger@vyatta.com>2011-01-26 10:52:46 +1000
committerStig Thormodsrud <stig@vyatta.com>2011-01-26 15:42:59 -0800
commit040ab3a8aa00b7d9650836325d20e98ac304773d (patch)
tree165c7afcd9a2ba57d26f5f666a111e2874fd55d2 /templates
parent65381a485162c49ed605e9687bce1882609047b5 (diff)
downloadvyatta-cfg-system-040ab3a8aa00b7d9650836325d20e98ac304773d.tar.gz
vyatta-cfg-system-040ab3a8aa00b7d9650836325d20e98ac304773d.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(@)"