浏览代码

interface type for wifi adapter search

Bob Mottram 7 年前
父节点
当前提交
cd2af02c11
共有 3 个文件被更改,包括 15 次插入8 次删除
  1. 4
    2
      src/freedombone-mesh-batman
  2. 10
    5
      src/freedombone-utils-wifi
  3. 1
    1
      src/freedombone-wifi

+ 4
- 2
src/freedombone-mesh-batman 查看文件

34
 # hotspot passphrase must be 5 characters or longer
34
 # hotspot passphrase must be 5 characters or longer
35
 HOTSPOT_PASSPHRASE="${PROJECT_NAME}"
35
 HOTSPOT_PASSPHRASE="${PROJECT_NAME}"
36
 
36
 
37
+interface_type='wlan'
38
+
37
 source /usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-wifi
39
 source /usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-wifi
38
 source /usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-mesh
40
 source /usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-mesh
39
 
41
 
40
 mesh_protocol_init
42
 mesh_protocol_init
41
-update_wifi_adaptors
43
+update_wifi_adaptors "${interface_type}"
42
 
44
 
43
 if [ ! "$IFACE" ]; then
45
 if [ ! "$IFACE" ]; then
44
     echo $'No wlan adaptor'
46
     echo $'No wlan adaptor'
168
 
170
 
169
 # shellcheck disable=SC2120
171
 # shellcheck disable=SC2120
170
 function start {
172
 function start {
171
-    update_wifi_adaptors
173
+    update_wifi_adaptors "${interface_type}"
172
 
174
 
173
     if [ -z "$IFACE" ] ; then
175
     if [ -z "$IFACE" ] ; then
174
         echo 'error: unable to find wifi interface, not enabling batman-adv mesh'
176
         echo 'error: unable to find wifi interface, not enabling batman-adv mesh'

+ 10
- 5
src/freedombone-utils-wifi 查看文件

100
     fi
100
     fi
101
     dpkg -i "$atheros_drivers_file"
101
     dpkg -i "$atheros_drivers_file"
102
     reset_usb_devices
102
     reset_usb_devices
103
-    update_wifi_adaptors
103
+    update_wifi_adaptors 'wlan'
104
     if [ "$IFACE" ]; then
104
     if [ "$IFACE" ]; then
105
         wpa_action "${IFACE}" stop
105
         wpa_action "${IFACE}" stop
106
         wpa_cli -i "${IFACE}" terminate
106
         wpa_cli -i "${IFACE}" terminate
198
 }
198
 }
199
 
199
 
200
 function update_wifi_adaptors {
200
 function update_wifi_adaptors {
201
+    interface_type="$1"
201
     IFACE=
202
     IFACE=
202
     IFACE_SECONDARY=
203
     IFACE_SECONDARY=
203
 
204
 
205
+    if [ ! "$interface_type" ]; then
206
+        interface_type='wlan'
207
+    fi
208
+
204
     for i in $(seq 10 -1 0); do
209
     for i in $(seq 10 -1 0); do
205
-        ifdown --force "wlan${i}" 2> /dev/null
210
+        ifdown --force "${interface_type}${i}" 2> /dev/null
206
     done
211
     done
207
 
212
 
208
     for i in $(seq 10 -1 0); do
213
     for i in $(seq 10 -1 0); do
209
-        if grep -q "wlan${i}" /proc/net/dev; then
214
+        if grep -q "${interface_type}${i}" /proc/net/dev; then
210
             if [ ! $IFACE ]; then
215
             if [ ! $IFACE ]; then
211
                 IFACE="wlan${i}"
216
                 IFACE="wlan${i}"
212
             else
217
             else
213
-                IFACE_SECONDARY="wlan${i}"
218
+                IFACE_SECONDARY="${interface_type}${i}"
214
                 return
219
                 return
215
             fi
220
             fi
216
         fi
221
         fi
479
 
484
 
480
 function create_networks_interactive {
485
 function create_networks_interactive {
481
     remove_config_param "WIFI_INTERFACE"
486
     remove_config_param "WIFI_INTERFACE"
482
-    update_wifi_adaptors
487
+    update_wifi_adaptors 'wlan'
483
     if [ ! "$IFACE" ]; then
488
     if [ ! "$IFACE" ]; then
484
         # Don't try to configure wifi if there are no adaptors
489
         # Don't try to configure wifi if there are no adaptors
485
         return
490
         return

+ 1
- 1
src/freedombone-wifi 查看文件

150
     else
150
     else
151
         sleep "${WAIT_SEC}"
151
         sleep "${WAIT_SEC}"
152
     fi
152
     fi
153
-    update_wifi_adaptors
153
+    update_wifi_adaptors 'wlan'
154
     if [ ! $IFACE ]; then
154
     if [ ! $IFACE ]; then
155
         echo $'No wifi adaptors were found'
155
         echo $'No wifi adaptors were found'
156
         exit 872356
156
         exit 872356