Merge branch 'napa' of git.vyatta.com:/git/vyatta-cfg-system into napa

10 files changed, 12 insertions, 9 deletions

diff --git a/templates/interfaces/ethernet/node.def b/templates/interfaces/ethernet/node.def
index 31883c64..0b55de8a 100644
--- a/templates/interfaces/ethernet/node.def
+++ b/templates/interfaces/ethernet/node.def
@@ -14,6 +14,14 @@ syntax:expression: exec \
     fi"
 
 begin: rm -f /tmp/speed-duplex.$VAR(@)
+       if [ -d "/sys/class/net/$VAR(@)" ]; then
+         # assume hw-id always exists (as orig impl did)
+         s_mac="$VAR(hw-id/@)"
+         if [ -n "$VAR(mac/@)" ]; then
+           s_mac="$VAR(mac/@)"
+         fi
+         /opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(@) --set-mac $s_mac
+       fi
 
 create: ip link set "$VAR(@)" up
 	/opt/vyatta/sbin/vyatta-link-detect $VAR(@) on
diff --git a/templates/interfaces/ethernet/node.tag/mac/node.def b/templates/interfaces/ethernet/node.tag/mac/node.def
index c9fbb0fe..5b797830 100644
--- a/templates/interfaces/ethernet/node.tag/mac/node.def
+++ b/templates/interfaces/ethernet/node.tag/mac/node.def
@@ -1,9 +1,4 @@
 type: macaddr
-priority: 317   # must be set before dhcp client
 help: Media Access Control (MAC) address
 syntax:expression: exec "\
 	/opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(../@) --valid-mac $VAR(@)"
-update: /opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(../@) --set-mac $VAR(@)
-delete: [ -d /sys/class/net/$VAR(../@) ] || exit 0
-        /opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(../@) --set-mac $VAR(../hw-id/@)
-
diff --git a/templates/interfaces/node.def b/templates/interfaces/node.def
index ee75b174..e4192f96 100644
--- a/templates/interfaces/node.def
+++ b/templates/interfaces/node.def
@@ -1,2 +1 @@
-priority: 850
 help: Network interfaces
diff --git a/templates/service/node.def b/templates/service/node.def
index c88bc349..0682c74c 100644
--- a/templates/service/node.def
+++ b/templates/service/node.def
@@ -1,2 +1 @@
-priority: 900
 help: Services
diff --git a/templates/system/ipv6/blacklist/node.def b/templates/system/ipv6/blacklist/node.def
index ce8dafd1..081425bd 100644
--- a/templates/system/ipv6/blacklist/node.def
+++ b/templates/system/ipv6/blacklist/node.def
@@ -1,3 +1,4 @@
+priority: 400
 help: Prevent the IPv6 kernel module from being loaded
 
 create:
diff --git a/templates/system/ipv6/disable-forwarding/node.def b/templates/system/ipv6/disable-forwarding/node.def
index 4d374455..10357338 100644
--- a/templates/system/ipv6/disable-forwarding/node.def
+++ b/templates/system/ipv6/disable-forwarding/node.def
@@ -1,3 +1,4 @@
+priority: 400
 help: Disable IPv6 forwarding on all interfaces
 
 # Disable IPv6 forwarding for all interfaces we currently have,
diff --git a/templates/system/ipv6/disable/node.def b/templates/system/ipv6/disable/node.def
index be1ce2f5..eb61557f 100644
--- a/templates/system/ipv6/disable/node.def
+++ b/templates/system/ipv6/disable/node.def
@@ -1,3 +1,4 @@
+priority: 400
 help: Disable assignment of IPv6 addresses on all interfaces
 
 create:
diff --git a/templates/system/ipv6/neighbor/node.def b/templates/system/ipv6/neighbor/node.def
index ed434588..ca609636 100644
--- a/templates/system/ipv6/neighbor/node.def
+++ b/templates/system/ipv6/neighbor/node.def
@@ -1 +1,2 @@
+priority: 400
 help: Parameters for Neighbor cache
diff --git a/templates/system/ipv6/node.def b/templates/system/ipv6/node.def
index 4801c82d..d67a124a 100644
--- a/templates/system/ipv6/node.def
+++ b/templates/system/ipv6/node.def
@@ -1,2 +1 @@
-priority: 400
 help: IPv6 settings
diff --git a/templates/system/node.def b/templates/system/node.def
index 156b6317..5a6953a7 100644
--- a/templates/system/node.def
+++ b/templates/system/node.def
@@ -1,2 +1 @@
-priority: 405
 help: System parameters