svn commit: r260262 - head/usr.sbin/bsdinstall/scripts

[Gavin Atkinson]

Author: gavin
Date: Sat Jan  4 17:09:41 2014
New Revision: 260262
URL: http://svnweb.freebsd.org/changeset/base/260262

Log:
  Allow bsdinstall to use WPA-Enterprise networks when installing.  This
  only allows basic username/password config, and does not provide the
  ability to set any of the other WPA options.  Regardless, this is
  generally sufficient to associate.
  
  Perhaps in the future this could allow full configuring (e.g. being able
  to set "anonymous identity", and perhaps some of the more obscure WPA
  options), though perhaps that will better belong in bsdconfig when that
  grows wlan config ability.
  
  MFC after:	1 week

Modified:
  head/usr.sbin/bsdinstall/scripts/wlanconfig

Modified: head/usr.sbin/bsdinstall/scripts/wlanconfig
==============================================================================
--- head/usr.sbin/bsdinstall/scripts/wlanconfig	Sat Jan  4 16:44:05 2014	(r260261)
+++ head/usr.sbin/bsdinstall/scripts/wlanconfig	Sat Jan  4 17:09:41 2014	(r260262)
@@ -110,6 +110,29 @@ echo "network={
 	psk=\"$PASS\"
 	priority=5
 }" >> $BSDINSTALL_TMPETC/wpa_supplicant.conf
+elif echo $ENCRYPTION | grep -q EAP; then
+	exec 3>&1
+	USERPASS=`dialog --insecure --backtitle "FreeBSD Installer" \
+	    --title "WPA-Enterprise Setup" --mixedform "" 0 0 0 \
+		"SSID" 1 0 "$NETWORK" 1 12 0 0 2 \
+		"Username" 2 0 "" 2 12 25 63 0 \
+		"Password" 3 0 "" 3 12 25 63 1 \
+		2>&1 1>&3` \
+	|| exec $0 $@
+	exec 3>&-
+echo "network={
+	ssid=\"$NETWORK\"
+	key_mgmt=WPA-EAP" >> $BSDINSTALL_TMPETC/wpa_supplicant.conf
+echo "$USERPASS" | awk '
+{
+	if (NR == 1) {
+		printf "	identity=\"%s\"\n", $1;
+	} else if (NR == 2) {
+		printf "	password=\"%s\"\n", $1;
+	}
+}' >> $BSDINSTALL_TMPETC/wpa_supplicant.conf
+echo "	priority=5
+}" >> $BSDINSTALL_TMPETC/wpa_supplicant.conf
 elif echo $ENCRYPTION | grep -q WEP; then
 	exec 3>&1
 	WEPKEY=`dialog --insecure --backtitle "FreeBSD Installer" \