Attachment 177635 Details for Bug 214933 – the patch [3]

[patch] the patch [3]

bsdinstall-wireless.patch (text/plain), 1.96 KB, created by Maxim Filimonov on 2016-12-03 16:45:44 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Maxim Filimonov

Created: 2016-12-03 16:45:44 UTC

Size: 1.96 KB

patch

obsolete

>Index: usr.sbin/bsdinstall/scripts/wlanconfig
>===================================================================
>--- usr.sbin/bsdinstall/scripts/wlanconfig	(revision 309449)
>+++ usr.sbin/bsdinstall/scripts/wlanconfig	(working copy)
>@@ -207,6 +207,7 @@
> 
> while :
> do
>+	SCANSSID=0
> 	output=$( wpa_cli scan 2>&1 )
> 	f_dprintf "%s" "$output"
> 	dialog --backtitle "FreeBSD Installer" --title "Scanning" \
>@@ -236,8 +237,20 @@
> 		break
> 		;;
> 	1)	# Cancel
>-		exit 1
>-		;;
>+		# here we ask if the user wants to select the network manually
>+		f_dialog_yesno "Do you want to select the network manually?" || exit
>+		# and take the manual input
>+		# first, take the ssid
>+		f_dialog_title "Network Selection"
>+		f_dialog_input NETWORK "Enter SSID" || exit
>+		# then, the encryption
>+		ENCRYPTION=$( dialog --backtitle "$DIALOG_BACKTITLE" --title \
>+			"$DIALOG_TITLE" --menu "Select encryption type" 0 0 0 \
>+			"1 WPA/WPA2 PSK" "" "2 WPA/WPA2 EAP" "" "3 WEP" "" "0 None" "" 2>&1 1>&3 )
>+		[ $? -eq 0 ] || exit 1
>+		SCANSSID=1
>+		f_dialog_title_restore
>+		break
> 	3)	# Rescan
> 		;;
> 	esac
>@@ -244,7 +257,7 @@
> 	exec 3>&-
> done
> 
>-ENCRYPTION=`echo "$NETWORKS" | awk -F '\t' \
>+[ -z "$ENCRYPTION" ] && ENCRYPTION=`echo "$NETWORKS" | awk -F '\t' \
>     "/^\"$NETWORK\"\t/ {printf(\"%s\n\", \\\$2 );}"`
> 
> if echo $ENCRYPTION | grep -q 'PSK'; then
>@@ -258,6 +271,7 @@
> 	exec 3>&-
> echo "network={
> 	ssid=\"$NETWORK\"
>+	scan_ssid=$SCANSSID
> 	psk=\"$PASS\"
> 	priority=5
> }" >> $BSDINSTALL_TMPETC/wpa_supplicant.conf
>@@ -273,6 +287,7 @@
> 	exec 3>&-
> echo "network={
> 	ssid=\"$NETWORK\"
>+	scan_ssid=$SCANSSID
> 	key_mgmt=WPA-EAP" >> $BSDINSTALL_TMPETC/wpa_supplicant.conf
> echo "$USERPASS" | awk '
> {
>@@ -294,6 +309,7 @@
> 	|| exec $0 $@
> echo "network={
> 	ssid=\"$NETWORK\"
>+	scan_ssid=$SCANSSID
> 	key_mgmt=NONE
> 	wep_key0=\"$WEPKEY\"
> 	wep_tx_keyidx=0
>@@ -302,6 +318,7 @@
> else	# Open
> echo "network={
> 	ssid=\"$NETWORK\"
>+	scan_ssid=$SCANSSID
> 	key_mgmt=NONE
> 	priority=5
> }" >> $BSDINSTALL_TMPETC/wpa_supplicant.conf

Actions: View | Diff

Attachments on bug 214933: 177523 | 177623 | 177635 | 177641