Bob Mottram 9 anni fa
parent
commit
fdf20a19cd
2 ha cambiato i file con 30 aggiunte e 0 eliminazioni
  1. 10
    0
      src/freedombone
  2. 20
    0
      src/freedombone-client

+ 10
- 0
src/freedombone Vedi File

@@ -1738,6 +1738,16 @@ function mesh_babel {
1738 1738
   echo '        IFACE=wlan1' >> $babel_script
1739 1739
   echo '    fi' >> $babel_script
1740 1740
   echo 'fi' >> $babel_script
1741
+  echo 'if [[ $IFACE == "wlan0" ]]; then' >> $babel_script
1742
+  echo '    if grep -q "wlan2" /proc/net/dev; then' >> $babel_script
1743
+  echo '        IFACE=wlan2' >> $babel_script
1744
+  echo '    fi' >> $babel_script
1745
+  echo 'fi' >> $babel_script
1746
+  echo 'if [[ $IFACE == "wlan0" ]]; then' >> $babel_script
1747
+  echo '    if grep -q "wlan3" /proc/net/dev; then' >> $babel_script
1748
+  echo '        IFACE=wlan3' >> $babel_script
1749
+  echo '    fi' >> $babel_script
1750
+  echo 'fi' >> $babel_script
1741 1751
   echo '' >> $babel_script
1742 1752
   echo 'if [[ ! grep -q "$IFACE" /proc/net/dev || $1 == "stop" ]]; then' >> $babel_script
1743 1753
   echo '    if ! grep -q "$IFACE" /proc/net/dev; then' >> $babel_script

+ 20
- 0
src/freedombone-client Vedi File

@@ -131,6 +131,16 @@ function mesh_babel {
131 131
   echo '        IFACE=wlan1' >> $babel_script
132 132
   echo '    fi' >> $babel_script
133 133
   echo 'fi' >> $babel_script
134
+  echo 'if [[ $IFACE == "wlan0" ]]; then' >> $babel_script
135
+  echo '    if grep -q "wlan2" /proc/net/dev; then' >> $babel_script
136
+  echo '        IFACE=wlan2' >> $babel_script
137
+  echo '    fi' >> $babel_script
138
+  echo 'fi' >> $babel_script
139
+  echo 'if [[ $IFACE == "wlan0" ]]; then' >> $babel_script
140
+  echo '    if grep -q "wlan3" /proc/net/dev; then' >> $babel_script
141
+  echo '        IFACE=wlan3' >> $babel_script
142
+  echo '    fi' >> $babel_script
143
+  echo 'fi' >> $babel_script
134 144
   echo '' >> $babel_script
135 145
   echo 'if [[ ! grep -q "$IFACE" /proc/net/dev || $1 == "stop" ]]; then' >> $babel_script
136 146
   echo '    if ! grep -q "$IFACE" /proc/net/dev; then' >> $babel_script
@@ -202,6 +212,16 @@ function mesh_batman {
202 212
   echo '        IFACE=wlan1' >> $batman_script
203 213
   echo '    fi' >> $batman_script
204 214
   echo 'fi' >> $batman_script
215
+  echo 'if [[ $IFACE == "wlan0" ]]; then' >> $batman_script
216
+  echo '    if grep -q "wlan2" /proc/net/dev; then' >> $batman_script
217
+  echo '        IFACE=wlan2' >> $batman_script
218
+  echo '    fi' >> $batman_script
219
+  echo 'fi' >> $batman_script
220
+  echo 'if [[ $IFACE == "wlan0" ]]; then' >> $batman_script
221
+  echo '    if grep -q "wlan3" /proc/net/dev; then' >> $batman_script
222
+  echo '        IFACE=wlan3' >> $batman_script
223
+  echo '    fi' >> $batman_script
224
+  echo 'fi' >> $batman_script
205 225
   echo '' >> $batman_script
206 226
   echo 'if [ -e /etc/default/batctl ]; then' >> $batman_script
207 227
   echo '    . /etc/default/batctl' >> $batman_script