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

add rescan to wifi

Browse source
This commit is contained in:
Tobias Powalowski 2023-07-14 20:52:14 +02:00
parent f3322c122c
commit 756af5779b
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
usr/bin/archboot-network.sh
View file

@ -97,7 +97,6 @@ _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 "${_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 42-49 | grep -q 'open')" ]] \ if ! [[ "$(iwctl station "${_INTERFACE}" get-networks | grep -w "${_WLAN_SSID}" | cut -c 42-49 | grep -q 'open')" ]] \
@ -121,16 +120,15 @@ _do_wireless() {
iwctl --passphrase="${_WLAN_KEY}" station "${_INTERFACE}" "${_WLAN_CONNECT}" "${_WLAN_SSID}" &>"${_NO_LOG}" && _WLAN_AUTH=1 iwctl --passphrase="${_WLAN_KEY}" station "${_INTERFACE}" "${_WLAN_CONNECT}" "${_WLAN_SSID}" &>"${_NO_LOG}" && _WLAN_AUTH=1
fi fi
sleep 3 sleep 3
_printk on
if [[ -n "${_WLAN_AUTH}" ]]; then if [[ -n "${_WLAN_AUTH}" ]]; then
_dialog --infobox "Authentification was successful." 3 70 _dialog --infobox "Authentification was successful." 3 70
sleep 3 sleep 3
else else
_WLAN_AUTH=""
_dialog --infobox "Error:\nAuthentification failed. Please configure again!" 6 60 _dialog --infobox "Error:\nAuthentification failed. Please configure again!" 6 60
sleep 5 sleep 5
return 1
fi fi
_printk on
done
fi fi
} }
@ -161,11 +159,11 @@ _network() {
_NETWORK_PROFILE=/etc/systemd/network/$(cat "${_ANSWER}").network _NETWORK_PROFILE=/etc/systemd/network/$(cat "${_ANSWER}").network
# wifi setup first # wifi setup first
_CONTINUE="" _CONTINUE=""
while [[ -z "${_CONTINUE}" ]]; do while [[ -z "${_CONTINUE}" && "${_CONNECTION}" == "wireless" ]]; do
if _do_wireless; then if _do_wireless; then
_CONTINUE=1 _CONTINUE=1
else else
_abort _CONTINUE=""
fi fi
done done
# dhcp switch # dhcp switch