Selaa lähdekoodia

If wifi interface is not wlan0 then stick with the configuration

Bob Mottram 9 vuotta sitten
vanhempi
commit
71a62ea56f
2 muutettua tiedostoa jossa 19 lisäystä ja 10 poistoa
  1. 8
    4
      src/freedombone
  2. 11
    6
      src/freedombone-client

+ 8
- 4
src/freedombone Näytä tiedosto

1733
   echo 'fi' >> $babel_script
1733
   echo 'fi' >> $babel_script
1734
   echo '' >> $babel_script
1734
   echo '' >> $babel_script
1735
   echo "IFACE=$WIFI_INTERFACE" >> $babel_script
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
   echo 'fi' >> $babel_script
1740
   echo 'fi' >> $babel_script
1739
   echo '' >> $babel_script
1741
   echo '' >> $babel_script
1740
   echo 'if [[ ! grep -q "$IFACE" /proc/net/dev || $1 == "stop" ]]; then' >> $babel_script
1742
   echo 'if [[ ! grep -q "$IFACE" /proc/net/dev || $1 == "stop" ]]; then' >> $babel_script
1828
   echo "IFACE=$WIFI_INTERFACE" >> $batman_script
1830
   echo "IFACE=$WIFI_INTERFACE" >> $batman_script
1829
   echo 'EIFACE=eth0' >> $batman_script
1831
   echo 'EIFACE=eth0' >> $batman_script
1830
   echo '' >> $batman_script
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
   echo 'fi' >> $batman_script
1837
   echo 'fi' >> $batman_script
1834
   echo '' >> $batman_script
1838
   echo '' >> $batman_script
1835
   echo 'if [ -e /etc/default/batctl ]; then' >> $batman_script
1839
   echo 'if [ -e /etc/default/batctl ]; then' >> $batman_script

+ 11
- 6
src/freedombone-client Näytä tiedosto

32
 VERSION="1.01"
32
 VERSION="1.01"
33
 
33
 
34
 WIFI_CHANNEL=2
34
 WIFI_CHANNEL=2
35
+WIFI_INTERFACE=wlan0
35
 
36
 
36
 # B.A.T.M.A.N settings
37
 # B.A.T.M.A.N settings
37
 BATMAN_CELLID='02:BA:00:00:03:01'
38
 BATMAN_CELLID='02:BA:00:00:03:01'
124
   echo '    fi' >> $babel_script
125
   echo '    fi' >> $babel_script
125
   echo 'fi' >> $babel_script
126
   echo 'fi' >> $babel_script
126
   echo '' >> $babel_script
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
   echo 'fi' >> $babel_script
133
   echo 'fi' >> $babel_script
131
   echo '' >> $babel_script
134
   echo '' >> $babel_script
132
   echo 'if [[ ! grep -q "$IFACE" /proc/net/dev || $1 == "stop" ]]; then' >> $babel_script
135
   echo 'if [[ ! grep -q "$IFACE" /proc/net/dev || $1 == "stop" ]]; then' >> $babel_script
191
   echo '' >> $batman_script
194
   echo '' >> $batman_script
192
   echo '# Ethernet bridge definition (bridged to bat0)' >> $batman_script
195
   echo '# Ethernet bridge definition (bridged to bat0)' >> $batman_script
193
   echo 'BRIDGE=br-mesh' >> $batman_script
196
   echo 'BRIDGE=br-mesh' >> $batman_script
194
-  echo 'IFACE=wlan0' >> $batman_script
197
+  echo "IFACE=$WIFI_INTERFACE" >> $batman_script
195
   echo 'EIFACE=eth0' >> $batman_script
198
   echo 'EIFACE=eth0' >> $batman_script
196
   echo '' >> $batman_script
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
   echo 'fi' >> $batman_script
204
   echo 'fi' >> $batman_script
200
   echo '' >> $batman_script
205
   echo '' >> $batman_script
201
   echo 'if [ -e /etc/default/batctl ]; then' >> $batman_script
206
   echo 'if [ -e /etc/default/batctl ]; then' >> $batman_script