root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-20 03:50:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

rename WPA_AUTH to WLAN_AUTH

Browse source
This commit is contained in:
Tobias Powalowski 2022-12-10 10:14:29 +01:00
parent 264259aa04
commit 43e2b8d2b2
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
usr/lib/archboot/installer/network.sh
View file

@ -26,7 +26,7 @@ do_wireless() {
WLAN_HIDDEN="" WLAN_HIDDEN=""
WLAN_SSID="" WLAN_SSID=""
WLAN_KEY="" WLAN_KEY=""
WPA_AUTH="" WLAN_AUTH=""
if [[ "${CONNECTION}" == "wireless" ]]; then if [[ "${CONNECTION}" == "wireless" ]]; then
# disconnect the interface first! # disconnect the interface first!
iwctl station "${INTERFACE}" disconnect iwctl station "${INTERFACE}" disconnect
@ -46,7 +46,7 @@ do_wireless() {
#shellcheck disable=SC2001,SC2086 #shellcheck disable=SC2001,SC2086
WLAN_SSID="$(echo ${WLAN_SSID} | sed -e 's|#|\ |g')" WLAN_SSID="$(echo ${WLAN_SSID} | sed -e 's|#|\ |g')"
#shellcheck disable=SC2001,SC2086 #shellcheck disable=SC2001,SC2086
while [[ -z "${WPA_AUTH}" ]]; do while [[ -z "${WLAN_AUTH}" ]]; do
# expect hidden network has a WLAN_KEY # expect hidden network has a WLAN_KEY
#shellcheck disable=SC2143 #shellcheck disable=SC2143
if ! [[ "$(iwctl station "${INTERFACE}" get-networks | grep -w "${WLAN_SSID}" | cut -c 45-49 | grep -q 'open')" ]] && [[ "${WLAN_CONNECT}" == "connect-hidden" ]]; then if ! [[ "$(iwctl station "${INTERFACE}" get-networks | grep -w "${WLAN_SSID}" | cut -c 45-49 | grep -q 'open')" ]] && [[ "${WLAN_CONNECT}" == "connect-hidden" ]]; then
@ -56,11 +56,11 @@ do_wireless() {
# time to connect # time to connect
DIALOG --infobox "Connection to ${WLAN_SSID} with ${INTERFACE} ..." 3 70 DIALOG --infobox "Connection to ${WLAN_SSID} with ${INTERFACE} ..." 3 70
if [[ -z "${WLAN_KEY}" ]]; then if [[ -z "${WLAN_KEY}" ]]; then
iwctl station "${INTERFACE}" "${WLAN_CONNECT}" "${WLAN_SSID}" && WPA_AUTH="1" iwctl station "${INTERFACE}" "${WLAN_CONNECT}" "${WLAN_SSID}" && WLAN_AUTH="1"
else else
iwctl --passphrase="${WLAN_KEY}" station "${INTERFACE}" "${WLAN_CONNECT}" "${WLAN_SSID}" && WPA_AUTH="1" iwctl --passphrase="${WLAN_KEY}" station "${INTERFACE}" "${WLAN_CONNECT}" "${WLAN_SSID}" && WLAN_AUTH="1"
fi fi
if [[ "${WPA_AUTH}" == "1" ]]; then if [[ "${WLAN_AUTH}" == "1" ]]; then
DIALOG --infobox "Authentification successfull. Continuing in 3 seconds ..." 3 70 DIALOG --infobox "Authentification successfull. Continuing in 3 seconds ..." 3 70
sleep 3 sleep 3
else else