git: 912df915c266 - main - wlanconfig: allow to enter WiFi details if no networks found
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 01 Mar 2022 23:05:29 UTC
The branch main has been updated by asiciliano:
URL: https://cgit.FreeBSD.org/src/commit/?id=912df915c266cc19ba6a8465c7e9e35eba0e3d85
commit 912df915c266cc19ba6a8465c7e9e35eba0e3d85
Author: Alfonso S. Siciliano <asiciliano@FreeBSD.org>
AuthorDate: 2022-03-01 23:01:13 +0000
Commit: Alfonso S. Siciliano <asiciliano@FreeBSD.org>
CommitDate: 2022-03-01 23:04:57 +0000
wlanconfig: allow to enter WiFi details if no networks found
Improve the installer: wlanconfig allows user to enter WiFi details
if no networks found, useful to connect to a hidden SSID.
PR: 246192
Reported by: emaste
Approved by: bapt (mentor)
Differential Revision: https://reviews.freebsd.org/D34149
---
usr.sbin/bsdinstall/scripts/wlanconfig | 31 +++++++++++++++----------------
1 file changed, 15 insertions(+), 16 deletions(-)
diff --git a/usr.sbin/bsdinstall/scripts/wlanconfig b/usr.sbin/bsdinstall/scripts/wlanconfig
index c2234831be9d..3de1a3420909 100755
--- a/usr.sbin/bsdinstall/scripts/wlanconfig
+++ b/usr.sbin/bsdinstall/scripts/wlanconfig
@@ -213,23 +213,22 @@ while :; do
if [ ! "$NETWORKS" ]; then
f_dialog_title "$msg_error"
f_yesno "No wireless networks were found. Rescan?" && continue
- exit 1
+ else
+ f_dialog_title "Network Selection"
+ prompt="Select a wireless network to connect to."
+ f_dialog_menu_size height width rows "$DIALOG_TITLE" \
+ "$DIALOG_BACKTITLE" "$prompt" "" $menu_list
+ NETWORK=$( eval $DIALOG \
+ --title \"\$DIALOG_TITLE\" \
+ --backtitle \"\$DIALOG_BACKTITLE\" \
+ --extra-button \
+ --extra-label \"Rescan\" \
+ --menu \"\$prompt\" \
+ $height $width $rows \
+ $NETWORKS \
+ 2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
+ )
fi
-
- f_dialog_title "Network Selection"
- prompt="Select a wireless network to connect to."
- f_dialog_menu_size height width rows "$DIALOG_TITLE" \
- "$DIALOG_BACKTITLE" "$prompt" "" $menu_list
- NETWORK=$( eval $DIALOG \
- --title \"\$DIALOG_TITLE\" \
- --backtitle \"\$DIALOG_BACKTITLE\" \
- --extra-button \
- --extra-label \"Rescan\" \
- --menu \"\$prompt\" \
- $height $width $rows \
- $NETWORKS \
- 2>&1 >&$DIALOG_TERMINAL_PASSTHRU_FD
- )
retval=$?
f_dialog_data_sanitize NETWORK
case $retval in