浏览代码

Use automatic wifi adaptor detection

Bob Mottram 8 年前
父节点
当前提交
0ffe36cbc2
共有 2 个文件被更改,包括 7 次插入7 次删除
  1. 4
    4
      src/freedombone-image-customise
  2. 3
    3
      src/freedombone-utils-wifi

+ 4
- 4
src/freedombone-image-customise 查看文件

462
 }
462
 }
463
 
463
 
464
 configure_wifi() {
464
 configure_wifi() {
465
-    if [[ $VARIANT == "mesh" || $VARIANT == "meshclient" || $VARIANT == "meshusb" ]]; then
465
+    if [[ $VARIANT == "mesh"* ]]; then
466
         return
466
         return
467
     fi
467
     fi
468
 
468
 
469
     if [ -f $WIFI_NETWORKS_FILE ]; then
469
     if [ -f $WIFI_NETWORKS_FILE ]; then
470
-        chroot "$rootdir" ${PROJECT_NAME}-wifi -i $WIFI_INTERFACE --networks $WIFI_NETWORKS_FILE
470
+        chroot "$rootdir" ${PROJECT_NAME}-wifi --networks $WIFI_NETWORKS_FILE
471
         return
471
         return
472
     fi
472
     fi
473
 
473
 
475
         if [ ${#WIFI_PASSPHRASE} -lt 2 ]; then
475
         if [ ${#WIFI_PASSPHRASE} -lt 2 ]; then
476
             return
476
             return
477
         fi
477
         fi
478
-        chroot "$rootdir" ${PROJECT_NAME}-wifi -i $WIFI_INTERFACE -s $WIFI_SSID -t $WIFI_TYPE -p $WIFI_PASSPHRASE --hotspot $WIFI_HOTSPOT
478
+        chroot "$rootdir" ${PROJECT_NAME}-wifi -s $WIFI_SSID -t $WIFI_TYPE -p $WIFI_PASSPHRASE --hotspot $WIFI_HOTSPOT
479
     else
479
     else
480
-        chroot "$rootdir" ${PROJECT_NAME}-wifi -i $WIFI_INTERFACE -s $WIFI_SSID -t $WIFI_TYPE --hotspot $WIFI_HOTSPOT
480
+        chroot "$rootdir" ${PROJECT_NAME}-wifi -s $WIFI_SSID -t $WIFI_TYPE --hotspot $WIFI_HOTSPOT
481
     fi
481
     fi
482
 }
482
 }
483
 
483
 

+ 3
- 3
src/freedombone-utils-wifi 查看文件

60
     fi
60
     fi
61
 
61
 
62
     if [ -f $WIFI_NETWORKS_FILE ]; then
62
     if [ -f $WIFI_NETWORKS_FILE ]; then
63
-        ${PROJECT_NAME}-wifi -i $WIFI_INTERFACE --networks $WIFI_NETWORKS_FILE
63
+        ${PROJECT_NAME}-wifi --networks $WIFI_NETWORKS_FILE
64
         mark_completed $FUNCNAME
64
         mark_completed $FUNCNAME
65
         return
65
         return
66
     fi
66
     fi
74
             echo $'Wifi passphrase was too short'
74
             echo $'Wifi passphrase was too short'
75
             return
75
             return
76
         fi
76
         fi
77
-        ${PROJECT_NAME}-wifi -i $WIFI_INTERFACE -s $WIFI_SSID -t $WIFI_TYPE -p $WIFI_PASSPHRASE --hotspot $HOTSPOT --networks $WIFI_NETWORKS_FILE
77
+        ${PROJECT_NAME}-wifi -s $WIFI_SSID -t $WIFI_TYPE -p $WIFI_PASSPHRASE --hotspot $HOTSPOT --networks $WIFI_NETWORKS_FILE
78
     else
78
     else
79
-        ${PROJECT_NAME}-wifi -i $WIFI_INTERFACE -s $WIFI_SSID -t $WIFI_TYPE --hotspot $HOTSPOT --networks $WIFI_NETWORKS_FILE
79
+        ${PROJECT_NAME}-wifi -s $WIFI_SSID -t $WIFI_TYPE --hotspot $HOTSPOT --networks $WIFI_NETWORKS_FILE
80
     fi
80
     fi
81
     mark_completed $FUNCNAME
81
     mark_completed $FUNCNAME
82
 }
82
 }