From 0dca09fee902237e15201f7ba283d350be6f8868 Mon Sep 17 00:00:00 2001
From: Tim Niemeyer <tim.niemeyer@mastersword.de>
Date: Fri, 28 Sep 2012 20:11:38 +0200
Subject: [PATCH] just fix the mac on br-mesh when it's needed (better check)

Signed-off-by: Tim Niemeyer <tim.niemeyer@mastersword.de>
---
 root_file_system/dir300/etc/rc.local | 39 ++++++++++++++++------------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/root_file_system/dir300/etc/rc.local b/root_file_system/dir300/etc/rc.local
index e4b33ed..ef917bb 100755
--- a/root_file_system/dir300/etc/rc.local
+++ b/root_file_system/dir300/etc/rc.local
@@ -15,24 +15,29 @@ toLower() {
 }
 
 # todo: all devices or only dir300 ?
-BRMAC=`ip link | grep br-mesh -A1 | grep link | awk '{ print $2 }'`
-BRMAC=`toLower $BRMAC`
-WLMAC=`ip link | grep wlan0 -A1 | grep link | awk '{ print $2 }'`
-WLMAC=`toLower $WLMAC`
-ETMAC=`ip link | grep eth0 -A1 | grep link | awk '{ print $2 }'`
-ETMAC=`toLower $ETMAC`
+if uci get network.mesh.macaddr
+then
+  echo "MAC is set already"
+else
+  BRMAC=`ip link | grep br-mesh -A1 | grep link | awk '{ print $2 }'`
+  BRMAC=`toLower $BRMAC`
+  WLMAC=`ip link | grep wlan0 -A1 | grep link | awk '{ print $2 }'`
+  WLMAC=`toLower $WLMAC`
+  ETMAC=`ip link | grep eth0 -A1 | grep link | awk '{ print $2 }'`
+  ETMAC=`toLower $ETMAC`
 
-if [ "$WLMAC" != "" ] && [ "$BRMAC" != "" ] && [ "$BRMAC" = "$ETMAC" ]; then
-if [[ "$BRMAC" != "$WLMAC" ]]; then
-        logger -s "Fixing wrong MAC on br-mesh"
-        uci set network.mesh.macaddr=$WLMAC
-        uci commit
-        ifconfig br-mesh hw ether $WLMAC
-        ifconfig br-mesh down
-        ifconfig br-mesh up
-        #wait before reboot to generate tinc certificates and to be able
-        #to login over ssh bevore reboot in case of errors
-fi
+  if [ "$WLMAC" != "" ] && [ "$BRMAC" != "" ] && [ "$BRMAC" = "$ETMAC" ]; then
+    if [[ "$BRMAC" != "$WLMAC" ]]; then
+      echo "Fixing wrong MAC on br-mesh"
+      uci set network.mesh.macaddr=$WLMAC
+      uci commit
+      ifconfig br-mesh hw ether $WLMAC
+      ifconfig br-mesh down
+      ifconfig br-mesh up
+      #wait before reboot to generate tinc certificates and to be able
+      #to login over ssh bevore reboot in case of errors
+    fi
+  fi
 fi
 
 # Starting NTP-Client Daemon