Explorar el Código

If wifi interface is not wlan0 then stick with the configuration

Bob Mottram hace 9 años
padre
commit
71a62ea56f
Se han modificado 2 ficheros con 19 adiciones y 10 borrados
  1. 8
    4
      src/freedombone
  2. 11
    6
      src/freedombone-client

+ 8
- 4
src/freedombone Ver fichero

@@ -1733,8 +1733,10 @@ function mesh_babel {
1733 1733
   echo 'fi' >> $babel_script
1734 1734
   echo '' >> $babel_script
1735 1735
   echo "IFACE=$WIFI_INTERFACE" >> $babel_script
1736
-  echo 'if grep -q "wlan1" /proc/net/dev; then' >> $babel_script
1737
-  echo '    IFACE=wlan1' >> $babel_script
1736
+  echo 'if [[ $IFACE == "wlan0" ]]; then' >> $babel_script
1737
+  echo '    if grep -q "wlan1" /proc/net/dev; then' >> $babel_script
1738
+  echo '        IFACE=wlan1' >> $babel_script
1739
+  echo '    fi' >> $babel_script
1738 1740
   echo 'fi' >> $babel_script
1739 1741
   echo '' >> $babel_script
1740 1742
   echo 'if [[ ! grep -q "$IFACE" /proc/net/dev || $1 == "stop" ]]; then' >> $babel_script
@@ -1828,8 +1830,10 @@ function mesh_batman_bridge {
1828 1830
   echo "IFACE=$WIFI_INTERFACE" >> $batman_script
1829 1831
   echo 'EIFACE=eth0' >> $batman_script
1830 1832
   echo '' >> $batman_script
1831
-  echo 'if grep -q "wlan1" /proc/net/dev; then' >> $batman_script
1832
-  echo '    IFACE=wlan1' >> $batman_script
1833
+  echo 'if [[ $IFACE == "wlan0" ]]; then' >> $batman_script
1834
+  echo '    if grep -q "wlan1" /proc/net/dev; then' >> $batman_script
1835
+  echo '        IFACE=wlan1' >> $batman_script
1836
+  echo '    fi' >> $batman_script
1833 1837
   echo 'fi' >> $batman_script
1834 1838
   echo '' >> $batman_script
1835 1839
   echo 'if [ -e /etc/default/batctl ]; then' >> $batman_script

+ 11
- 6
src/freedombone-client Ver fichero

@@ -32,6 +32,7 @@ CURR_USER=$USER
32 32
 VERSION="1.01"
33 33
 
34 34
 WIFI_CHANNEL=2
35
+WIFI_INTERFACE=wlan0
35 36
 
36 37
 # B.A.T.M.A.N settings
37 38
 BATMAN_CELLID='02:BA:00:00:03:01'
@@ -124,9 +125,11 @@ function mesh_babel {
124 125
   echo '    fi' >> $babel_script
125 126
   echo 'fi' >> $babel_script
126 127
   echo '' >> $babel_script
127
-  echo 'IFACE=wlan0' >> $babel_script
128
-  echo 'if grep -q "wlan1" /proc/net/dev; then' >> $babel_script
129
-  echo '    IFACE=wlan1' >> $babel_script
128
+  echo "IFACE=$WIFI_INTERFACE" >> $babel_script
129
+  echo 'if [[ $IFACE == "wlan0" ]]; then' >> $babel_script
130
+  echo '    if grep -q "wlan1" /proc/net/dev; then' >> $babel_script
131
+  echo '        IFACE=wlan1' >> $babel_script
132
+  echo '    fi' >> $babel_script
130 133
   echo 'fi' >> $babel_script
131 134
   echo '' >> $babel_script
132 135
   echo 'if [[ ! grep -q "$IFACE" /proc/net/dev || $1 == "stop" ]]; then' >> $babel_script
@@ -191,11 +194,13 @@ function mesh_batman {
191 194
   echo '' >> $batman_script
192 195
   echo '# Ethernet bridge definition (bridged to bat0)' >> $batman_script
193 196
   echo 'BRIDGE=br-mesh' >> $batman_script
194
-  echo 'IFACE=wlan0' >> $batman_script
197
+  echo "IFACE=$WIFI_INTERFACE" >> $batman_script
195 198
   echo 'EIFACE=eth0' >> $batman_script
196 199
   echo '' >> $batman_script
197
-  echo 'if grep -q "wlan1" /proc/net/dev; then' >> $batman_script
198
-  echo '    IFACE=wlan1' >> $batman_script
200
+  echo 'if [[ $IFACE == "wlan0" ]]; then' >> $batman_script
201
+  echo '    if grep -q "wlan1" /proc/net/dev; then' >> $batman_script
202
+  echo '        IFACE=wlan1' >> $batman_script
203
+  echo '    fi' >> $batman_script
199 204
   echo 'fi' >> $batman_script
200 205
   echo '' >> $batman_script
201 206
   echo 'if [ -e /etc/default/batctl ]; then' >> $batman_script