From c2cacfe95ea51e8957e2885750fbe459d17ce229 Mon Sep 17 00:00:00 2001
From: John Southworth <john.southworth@vyatta.com>
Date: Tue, 27 Sep 2011 13:58:54 -0500
Subject: Bugfix 7492: Reset mac address to hw-id when the mac is deleted

---
 templates/interfaces/ethernet/node.def | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/templates/interfaces/ethernet/node.def b/templates/interfaces/ethernet/node.def
index 45d6ec09..e51fe7df 100644
--- a/templates/interfaces/ethernet/node.def
+++ b/templates/interfaces/ethernet/node.def
@@ -14,12 +14,17 @@ syntax:expression: exec \
     fi"
 
 begin: rm -f /tmp/speed-duplex.$VAR(@)
-       if [ -n "$VAR(mac/@)" ] &&
-	  [ -d "/sys/class/net/$VAR(@)" ]; then
-           /opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(@) \
-             --set-mac "$VAR(mac/@)"
+        if [ -d "/sys/class/net/$VAR(@)" ]; then
+           if [ -n "$VAR(mac/@)" ]; then
+                /opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(@) \
+                 --set-mac "$VAR(mac/@)"
+           else 
+                /opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(@) \
+                --set-mac "$VAR(hw-id/@)"
+           fi
        fi
 
+
 create: if ! cli-shell-api exists interfaces ethernet $VAR(@) disable;
 	then ip link set $VAR(@) up
 	fi
-- 
cgit v1.2.3