From owner-svn-src-head@FreeBSD.ORG Sat Jan 4 17:09:42 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 301F266E; Sat, 4 Jan 2014 17:09:42 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 1BFC21022; Sat, 4 Jan 2014 17:09:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s04H9fB9008105; Sat, 4 Jan 2014 17:09:41 GMT (envelope-from gavin@svn.freebsd.org) Received: (from gavin@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s04H9fhh008104; Sat, 4 Jan 2014 17:09:41 GMT (envelope-from gavin@svn.freebsd.org) Message-Id: <201401041709.s04H9fhh008104@svn.freebsd.org> From: Gavin Atkinson Date: Sat, 4 Jan 2014 17:09:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r260262 - head/usr.sbin/bsdinstall/scripts X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Jan 2014 17:09:42 -0000 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" \