From 71a62ea56f4e5555220092a35f7b6d4ba799c3f3 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Sun, 9 Aug 2015 14:45:59 +0100
Subject: [PATCH] If wifi interface is not wlan0 then stick with the
 configuration

---
 src/freedombone        | 12 ++++++++----
 src/freedombone-client | 17 +++++++++++------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/freedombone b/src/freedombone
index 42478f49..3d1f780d 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -1733,8 +1733,10 @@ function mesh_babel {
   echo 'fi' >> $babel_script
   echo '' >> $babel_script
   echo "IFACE=$WIFI_INTERFACE" >> $babel_script
-  echo 'if grep -q "wlan1" /proc/net/dev; then' >> $babel_script
-  echo '    IFACE=wlan1' >> $babel_script
+  echo 'if [[ $IFACE == "wlan0" ]]; then' >> $babel_script
+  echo '    if grep -q "wlan1" /proc/net/dev; then' >> $babel_script
+  echo '        IFACE=wlan1' >> $babel_script
+  echo '    fi' >> $babel_script
   echo 'fi' >> $babel_script
   echo '' >> $babel_script
   echo 'if [[ ! grep -q "$IFACE" /proc/net/dev || $1 == "stop" ]]; then' >> $babel_script
@@ -1828,8 +1830,10 @@ function mesh_batman_bridge {
   echo "IFACE=$WIFI_INTERFACE" >> $batman_script
   echo 'EIFACE=eth0' >> $batman_script
   echo '' >> $batman_script
-  echo 'if grep -q "wlan1" /proc/net/dev; then' >> $batman_script
-  echo '    IFACE=wlan1' >> $batman_script
+  echo 'if [[ $IFACE == "wlan0" ]]; then' >> $batman_script
+  echo '    if grep -q "wlan1" /proc/net/dev; then' >> $batman_script
+  echo '        IFACE=wlan1' >> $batman_script
+  echo '    fi' >> $batman_script
   echo 'fi' >> $batman_script
   echo '' >> $batman_script
   echo 'if [ -e /etc/default/batctl ]; then' >> $batman_script
diff --git a/src/freedombone-client b/src/freedombone-client
index b0f4c5e0..3555b72e 100755
--- a/src/freedombone-client
+++ b/src/freedombone-client
@@ -32,6 +32,7 @@ CURR_USER=$USER
 VERSION="1.01"
 
 WIFI_CHANNEL=2
+WIFI_INTERFACE=wlan0
 
 # B.A.T.M.A.N settings
 BATMAN_CELLID='02:BA:00:00:03:01'
@@ -124,9 +125,11 @@ function mesh_babel {
   echo '    fi' >> $babel_script
   echo 'fi' >> $babel_script
   echo '' >> $babel_script
-  echo 'IFACE=wlan0' >> $babel_script
-  echo 'if grep -q "wlan1" /proc/net/dev; then' >> $babel_script
-  echo '    IFACE=wlan1' >> $babel_script
+  echo "IFACE=$WIFI_INTERFACE" >> $babel_script
+  echo 'if [[ $IFACE == "wlan0" ]]; then' >> $babel_script
+  echo '    if grep -q "wlan1" /proc/net/dev; then' >> $babel_script
+  echo '        IFACE=wlan1' >> $babel_script
+  echo '    fi' >> $babel_script
   echo 'fi' >> $babel_script
   echo '' >> $babel_script
   echo 'if [[ ! grep -q "$IFACE" /proc/net/dev || $1 == "stop" ]]; then' >> $babel_script
@@ -191,11 +194,13 @@ function mesh_batman {
   echo '' >> $batman_script
   echo '# Ethernet bridge definition (bridged to bat0)' >> $batman_script
   echo 'BRIDGE=br-mesh' >> $batman_script
-  echo 'IFACE=wlan0' >> $batman_script
+  echo "IFACE=$WIFI_INTERFACE" >> $batman_script
   echo 'EIFACE=eth0' >> $batman_script
   echo '' >> $batman_script
-  echo 'if grep -q "wlan1" /proc/net/dev; then' >> $batman_script
-  echo '    IFACE=wlan1' >> $batman_script
+  echo 'if [[ $IFACE == "wlan0" ]]; then' >> $batman_script
+  echo '    if grep -q "wlan1" /proc/net/dev; then' >> $batman_script
+  echo '        IFACE=wlan1' >> $batman_script
+  echo '    fi' >> $batman_script
   echo 'fi' >> $batman_script
   echo '' >> $batman_script
   echo 'if [ -e /etc/default/batctl ]; then' >> $batman_script