Use automatic wifi adaptor detection
This commit is contained in:
parent
e6e21d0b24
commit
0ffe36cbc2
|
@ -462,12 +462,12 @@ atheros_wifi() {
|
||||||
}
|
}
|
||||||
|
|
||||||
configure_wifi() {
|
configure_wifi() {
|
||||||
if [[ $VARIANT == "mesh" || $VARIANT == "meshclient" || $VARIANT == "meshusb" ]]; then
|
if [[ $VARIANT == "mesh"* ]]; then
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -f $WIFI_NETWORKS_FILE ]; then
|
if [ -f $WIFI_NETWORKS_FILE ]; then
|
||||||
chroot "$rootdir" ${PROJECT_NAME}-wifi -i $WIFI_INTERFACE --networks $WIFI_NETWORKS_FILE
|
chroot "$rootdir" ${PROJECT_NAME}-wifi --networks $WIFI_NETWORKS_FILE
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -475,9 +475,9 @@ configure_wifi() {
|
||||||
if [ ${#WIFI_PASSPHRASE} -lt 2 ]; then
|
if [ ${#WIFI_PASSPHRASE} -lt 2 ]; then
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
chroot "$rootdir" ${PROJECT_NAME}-wifi -i $WIFI_INTERFACE -s $WIFI_SSID -t $WIFI_TYPE -p $WIFI_PASSPHRASE --hotspot $WIFI_HOTSPOT
|
chroot "$rootdir" ${PROJECT_NAME}-wifi -s $WIFI_SSID -t $WIFI_TYPE -p $WIFI_PASSPHRASE --hotspot $WIFI_HOTSPOT
|
||||||
else
|
else
|
||||||
chroot "$rootdir" ${PROJECT_NAME}-wifi -i $WIFI_INTERFACE -s $WIFI_SSID -t $WIFI_TYPE --hotspot $WIFI_HOTSPOT
|
chroot "$rootdir" ${PROJECT_NAME}-wifi -s $WIFI_SSID -t $WIFI_TYPE --hotspot $WIFI_HOTSPOT
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -60,7 +60,7 @@ function setup_wifi {
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -f $WIFI_NETWORKS_FILE ]; then
|
if [ -f $WIFI_NETWORKS_FILE ]; then
|
||||||
${PROJECT_NAME}-wifi -i $WIFI_INTERFACE --networks $WIFI_NETWORKS_FILE
|
${PROJECT_NAME}-wifi --networks $WIFI_NETWORKS_FILE
|
||||||
mark_completed $FUNCNAME
|
mark_completed $FUNCNAME
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
|
@ -74,9 +74,9 @@ function setup_wifi {
|
||||||
echo $'Wifi passphrase was too short'
|
echo $'Wifi passphrase was too short'
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
${PROJECT_NAME}-wifi -i $WIFI_INTERFACE -s $WIFI_SSID -t $WIFI_TYPE -p $WIFI_PASSPHRASE --hotspot $HOTSPOT --networks $WIFI_NETWORKS_FILE
|
${PROJECT_NAME}-wifi -s $WIFI_SSID -t $WIFI_TYPE -p $WIFI_PASSPHRASE --hotspot $HOTSPOT --networks $WIFI_NETWORKS_FILE
|
||||||
else
|
else
|
||||||
${PROJECT_NAME}-wifi -i $WIFI_INTERFACE -s $WIFI_SSID -t $WIFI_TYPE --hotspot $HOTSPOT --networks $WIFI_NETWORKS_FILE
|
${PROJECT_NAME}-wifi -s $WIFI_SSID -t $WIFI_TYPE --hotspot $HOTSPOT --networks $WIFI_NETWORKS_FILE
|
||||||
fi
|
fi
|
||||||
mark_completed $FUNCNAME
|
mark_completed $FUNCNAME
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue