From owner-svn-src-user@FreeBSD.ORG Sun Jan 30 15:05:11 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2017C1065670; Sun, 30 Jan 2011 15:05:11 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 107698FC1D; Sun, 30 Jan 2011 15:05:11 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0UF5ANt075571; Sun, 30 Jan 2011 15:05:10 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0UF5AwJ075569; Sun, 30 Jan 2011 15:05:10 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201101301505.p0UF5AwJ075569@svn.freebsd.org> From: Nathan Whitehorn Date: Sun, 30 Jan 2011 15:05:10 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218094 - user/nwhitehorn/bsdinstall/partedit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Jan 2011 15:05:11 -0000 Author: nwhitehorn Date: Sun Jan 30 15:05:10 2011 New Revision: 218094 URL: http://svn.freebsd.org/changeset/base/218094 Log: Make size adjustment for boot partitions somewhat cleaner. Modified: user/nwhitehorn/bsdinstall/partedit/gpart_ops.c Modified: user/nwhitehorn/bsdinstall/partedit/gpart_ops.c ============================================================================== --- user/nwhitehorn/bsdinstall/partedit/gpart_ops.c Sun Jan 30 14:22:45 2011 (r218093) +++ user/nwhitehorn/bsdinstall/partedit/gpart_ops.c Sun Jan 30 15:05:10 2011 (r218094) @@ -695,18 +695,13 @@ gpart_create(struct gprovider *pp, char if (geom == NULL) return; - size = gpart_max_free(geom, &firstfree); + maxsize = size = gpart_max_free(geom, &firstfree); if (size <= 0) { dialog_msgbox("Error", "No free space left on device.", 0, 0, TRUE); return; } - /* Leave a free megabyte in case we need to write a boot partition */ - if (size*sector >= (intmax_t)bootpart_size(scheme)) - size -= bootpart_size(scheme)/sector; - maxsize = size; - humanize_number(sizestr, 7, size*sector, "B", HN_AUTOSCALE, HN_NOSPACE | HN_DECIMAL); items[1].text = sizestr; @@ -818,6 +813,7 @@ addpartform: /* Now adjust the part we are really adding forward */ firstfree += bootpart_size(scheme) / sector; + size -= (bootpart_size(scheme) + stripe)/sector; if (stripe > 0 && (firstfree*sector % stripe) != 0) firstfree += (stripe - ((firstfree*sector) % stripe)) / sector; From owner-svn-src-user@FreeBSD.ORG Sun Jan 30 15:10:58 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9575D106566B; Sun, 30 Jan 2011 15:10:58 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 85D108FC08; Sun, 30 Jan 2011 15:10:58 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0UFAwGi075737; Sun, 30 Jan 2011 15:10:58 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0UFAw8U075735; Sun, 30 Jan 2011 15:10:58 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201101301510.p0UFAw8U075735@svn.freebsd.org> From: Nathan Whitehorn Date: Sun, 30 Jan 2011 15:10:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218095 - user/nwhitehorn/bsdinstall/partedit X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Jan 2011 15:10:58 -0000 Author: nwhitehorn Date: Sun Jan 30 15:10:58 2011 New Revision: 218095 URL: http://svn.freebsd.org/changeset/base/218095 Log: Do not show (null) for blank labels. Submitted by: brucec Modified: user/nwhitehorn/bsdinstall/partedit/gpart_ops.c Modified: user/nwhitehorn/bsdinstall/partedit/gpart_ops.c ============================================================================== --- user/nwhitehorn/bsdinstall/partedit/gpart_ops.c Sun Jan 30 15:05:10 2011 (r218094) +++ user/nwhitehorn/bsdinstall/partedit/gpart_ops.c Sun Jan 30 15:10:58 2011 (r218095) @@ -374,7 +374,7 @@ gpart_edit(struct gprovider *pp) oldtype = gc->lg_val; items[0].text = gc->lg_val; } - if (strcmp(gc->lg_name, "label") == 0) { + if (strcmp(gc->lg_name, "label") == 0 && gc->lg_val != NULL) { hadlabel = 1; items[3].text = gc->lg_val; } From owner-svn-src-user@FreeBSD.ORG Sun Jan 30 15:36:20 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 415BC1065675; Sun, 30 Jan 2011 15:36:20 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 320EE8FC1E; Sun, 30 Jan 2011 15:36:20 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0UFaKGi076350; Sun, 30 Jan 2011 15:36:20 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0UFaKWs076348; Sun, 30 Jan 2011 15:36:20 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201101301536.p0UFaKWs076348@svn.freebsd.org> From: Nathan Whitehorn Date: Sun, 30 Jan 2011 15:36:20 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218096 - user/nwhitehorn/bsdinstall X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Jan 2011 15:36:20 -0000 Author: nwhitehorn Date: Sun Jan 30 15:36:19 2011 New Revision: 218096 URL: http://svn.freebsd.org/changeset/base/218096 Log: Use a cleaner syntax for setting default parameters. Modified: user/nwhitehorn/bsdinstall/bsdinstall Modified: user/nwhitehorn/bsdinstall/bsdinstall ============================================================================== --- user/nwhitehorn/bsdinstall/bsdinstall Sun Jan 30 15:10:58 2011 (r218095) +++ user/nwhitehorn/bsdinstall/bsdinstall Sun Jan 30 15:36:19 2011 (r218096) @@ -1,11 +1,11 @@ #!/bin/sh -[ -z "$DISTRIBUTIONS" ] && export DISTRIBUTIONS="kernel.tgz world.tgz" -[ -z "$BSDINSTALL_LOG" ] && export BSDINSTALL_LOG="/tmp/bsdinstall_log" -[ -z "$BSDINSTALL_TMPETC" ] && export BSDINSTALL_TMPETC="/tmp/bsdinstall_etc" -[ -z "$PATH_FSTAB" ] && export PATH_FSTAB="$BSDINSTALL_TMPETC/fstab" -[ -z "$BSDINSTALL_DISTDIR" ] && export BSDINSTALL_DISTDIR="/usr/bsdinstall-dist" -[ -z "$BSDINSTALL_CHROOT" ] && export BSDINSTALL_CHROOT="/mnt" +: ${DISTRIBUTIONS="kernel.tgz world.tgz"}; export DISTRIBUTIONS +: ${BSDINSTALL_LOG="/tmp/bsdinstall_log"}; export BSDINSTALL_LOG +: ${BSDINSTALL_TMPETC="/tmp/bsdinstall_etc"}; export BSDINSTALL_TMPETC +: ${PATH_FSTAB="$BSDINSTALL_TMPETC/fstab"}; export PATH_FSTAB +: ${BSDINSTALL_DISTDIR="/usr/bsdinstall-dist"}; export BSDINSTALL_DISTDIR +: ${BSDINSTALL_CHROOT="/mnt"}; export BSDINSTALL_CHROOT VERB=$1; shift From owner-svn-src-user@FreeBSD.ORG Sun Jan 30 15:36:59 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 947011065675; Sun, 30 Jan 2011 15:36:59 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 850068FC1F; Sun, 30 Jan 2011 15:36:59 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p0UFaxh3076395; Sun, 30 Jan 2011 15:36:59 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p0UFaxOW076393; Sun, 30 Jan 2011 15:36:59 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201101301536.p0UFaxOW076393@svn.freebsd.org> From: Nathan Whitehorn Date: Sun, 30 Jan 2011 15:36:59 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218097 - user/nwhitehorn/bsdinstall/scripts X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Jan 2011 15:36:59 -0000 Author: nwhitehorn Date: Sun Jan 30 15:36:59 2011 New Revision: 218097 URL: http://svn.freebsd.org/changeset/base/218097 Log: Allow the services menu to keep state. Now, if it is reentered, the same boxes that were ticked earlier remain ticked. Modified: user/nwhitehorn/bsdinstall/scripts/services Modified: user/nwhitehorn/bsdinstall/scripts/services ============================================================================== --- user/nwhitehorn/bsdinstall/scripts/services Sun Jan 30 15:36:19 2011 (r218096) +++ user/nwhitehorn/bsdinstall/scripts/services Sun Jan 30 15:36:59 2011 (r218097) @@ -1,5 +1,12 @@ #!/bin/sh +if [ -f $BSDINSTALL_TMPETC/rc.conf.services ]; then + eval `sed -e s/YES/on/I -e s/NO/off/I $BSDINSTALL_TMPETC/rc.conf.services` +else + # Default service states. Everything is off if not enabled. + sshd_enable="on" +fi + echo -n > $BSDINSTALL_TMPETC/rc.conf.services exec 3>&1 @@ -7,9 +14,10 @@ DAEMONS=$(dialog --backtitle "FreeBSD In --title "System Configuration" --nocancel --separate-output \ --checklist "Choose the services you would like to be started at boot:" \ 0 0 0 \ - sshd "Secure shell daemon" on \ - ntpd "Synchronize system and network time" off \ - powerd "Adjust CPU frequency dynamically" off \ + sshd "Secure shell daemon" ${sshd_enable:-off} \ + moused "PS/2 mouse pointer on console" ${moused_enable:-off} \ + ntpd "Synchronize system and network time" ${ntpd_enable:-off} \ + powerd "Adjust CPU frequency dynamically" ${powerd_enable:-off} \ 2>&1 1>&3) exec 3>&- From owner-svn-src-user@FreeBSD.ORG Fri Feb 4 00:57:04 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AA5B01065670; Fri, 4 Feb 2011 00:57:04 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 98FC28FC15; Fri, 4 Feb 2011 00:57:04 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p140v49O064198; Fri, 4 Feb 2011 00:57:04 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p140v4N9064196; Fri, 4 Feb 2011 00:57:04 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <201102040057.p140v4N9064196@svn.freebsd.org> From: Doug Barton Date: Fri, 4 Feb 2011 00:57:04 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218245 - user/dougb/portmaster X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Feb 2011 00:57:04 -0000 Author: dougb Date: Fri Feb 4 00:57:04 2011 New Revision: 218245 URL: http://svn.freebsd.org/changeset/base/218245 Log: Add the ability to store the portmaster.rc file in the same directory as the script itself. Switch the test for existence of an rc file from -r to -s Modified: user/dougb/portmaster/portmaster Modified: user/dougb/portmaster/portmaster ============================================================================== --- user/dougb/portmaster/portmaster Fri Feb 4 00:48:41 2011 (r218244) +++ user/dougb/portmaster/portmaster Fri Feb 4 00:57:04 2011 (r218245) @@ -27,10 +27,13 @@ if [ -z "$PM_PARENT_PID" ]; then set -o allexport # Read a global rc file first - [ -r /usr/local/etc/portmaster.rc ] && . /usr/local/etc/portmaster.rc + [ -s /usr/local/etc/portmaster.rc ] && . /usr/local/etc/portmaster.rc + + # Allow the config file to be stored with the script + [ -s "${0%/*}/portmaster.rc" ] && . ${0%/*}/portmaster.rc # Read a local one next, and allow the command line to override - [ -r "$HOME/.portmasterrc" ] && . $HOME/.portmasterrc + [ -s "$HOME/.portmasterrc" ] && . $HOME/.portmasterrc set +o allexport my_environment=`set` From owner-svn-src-user@FreeBSD.ORG Sat Feb 5 16:03:08 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CC0731065670; Sat, 5 Feb 2011 16:03:08 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id BA9BB8FC13; Sat, 5 Feb 2011 16:03:08 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p15G38aw032962; Sat, 5 Feb 2011 16:03:08 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p15G38WN032958; Sat, 5 Feb 2011 16:03:08 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201102051603.p15G38WN032958@svn.freebsd.org> From: Nathan Whitehorn Date: Sat, 5 Feb 2011 16:03:08 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218330 - user/nwhitehorn/bsdinstall/scripts X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Feb 2011 16:03:08 -0000 Author: nwhitehorn Date: Sat Feb 5 16:03:08 2011 New Revision: 218330 URL: http://svn.freebsd.org/changeset/base/218330 Log: Add an interface for wireless configuration. This provides a menu of available wireless networks and lets the user set up WEP or WPA. Added: user/nwhitehorn/bsdinstall/scripts/wlanconfig (contents, props changed) Modified: user/nwhitehorn/bsdinstall/scripts/Makefile user/nwhitehorn/bsdinstall/scripts/netconfig Modified: user/nwhitehorn/bsdinstall/scripts/Makefile ============================================================================== --- user/nwhitehorn/bsdinstall/scripts/Makefile Sat Feb 5 15:37:10 2011 (r218329) +++ user/nwhitehorn/bsdinstall/scripts/Makefile Sat Feb 5 16:03:08 2011 (r218330) @@ -1,7 +1,7 @@ # $FreeBSD $ SCRIPTS= auto adduser config hostname jail keymap mount netconfig rootpass \ - services time umount + services time umount wlanconfig BINDIR= /usr/libexec/bsdinstall NO_MAN= true Modified: user/nwhitehorn/bsdinstall/scripts/netconfig ============================================================================== --- user/nwhitehorn/bsdinstall/scripts/netconfig Sat Feb 5 15:37:10 2011 (r218329) +++ user/nwhitehorn/bsdinstall/scripts/netconfig Sat Feb 5 16:03:08 2011 (r218330) @@ -25,9 +25,24 @@ INTERFACE=`echo $DIALOG_TAGS | xargs dia if [ $? -eq $DIALOG_CANCEL ]; then exit 1; fi exec 3>&- +# Do a dirty check to see if this a wireless interface -- there should be a +# better way +IFCONFIG_PREFIX="" +if ifconfig $INTERFACE | grep -q 'media: IEEE 802.11 Wireless'; then + NEXT_WLAN_IFACE=wlan0 # XXX + echo wlans_$INTERFACE=\"$NEXT_WLAN_IFACE\" >> $BSDINSTALL_TMPETC/rc.conf.net + IFCONFIG_PREFIX="WPA " + if [ ! -z $BSDINSTALL_CONFIGCURRENT ]; then + ifconfig $NEXT_WLAN_IFACE create wlandev $INTERFACE + ifconfig $NEXT_WLAN_IFACE up + fi + bsdinstall wlanconfig $NEXT_WLAN_IFACE || exec $0 + INTERFACE="$NEXT_WLAN_IFACE" +fi + dialog --backtitle 'FreeBSD Installer' --title 'Network Configuration' --yesno 'Would you like to use DHCP to configure this interface?' 0 0 if [ $? -eq $DIALOG_OK ]; then - echo ifconfig_$INTERFACE=\"DHCP\" >> $BSDINSTALL_TMPETC/rc.conf.net + echo ifconfig_$INTERFACE=\"${IFCONFIG_PREFIX}DHCP\" >> $BSDINSTALL_TMPETC/rc.conf.net if [ ! -z $BSDINSTALL_CONFIGCURRENT ]; then dialog --backtitle 'FreeBSD Installer' --infobox "Acquiring DHCP lease..." 0 0 @@ -57,8 +72,8 @@ if [ $? -eq $DIALOG_CANCEL ]; then exec exec 3>&- echo $INTERFACE $IF_CONFIG | - awk '{ - printf("ifconfig_%s=\"%s netmask %s\"\n", $1, $2, $3); + awk -v prefix="$IFCONFIG_PREFIX" '{ + printf("ifconfig_%s=\"%s%s netmask %s\"\n", $1, prefix, $2, $3); printf("defaultrouter=\"%s\"\n", $4); }' >> $BSDINSTALL_TMPETC/rc.conf.net Added: user/nwhitehorn/bsdinstall/scripts/wlanconfig ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ user/nwhitehorn/bsdinstall/scripts/wlanconfig Sat Feb 5 16:03:08 2011 (r218330) @@ -0,0 +1,104 @@ +#!/bin/sh + +echo -n > $BSDINSTALL_TMPETC/wpa_supplicant.conf +chmod 0600 $BSDINSTALL_TMPETC/wpa_supplicant.conf + +echo "ctrl_interface=/var/run/wpa_supplicant" >> $BSDINSTALL_TMPETC/wpa_supplicant.conf +echo "eapol_version=2" >> $BSDINSTALL_TMPETC/wpa_supplicant.conf +echo "ap_scan=1" >> $BSDINSTALL_TMPETC/wpa_supplicant.conf +echo "fast_reauth=1" >> $BSDINSTALL_TMPETC/wpa_supplicant.conf +echo >> $BSDINSTALL_TMPETC/wpa_supplicant.conf + +# Try to reach wpa_supplicant. If it isn't running and we can modify the +# existing system, start it. Otherwise, fail. +(wpa_cli ping >/dev/null 2>/dev/null || ([ ! -z $BSDINSTALL_CONFIGCURRENT ] && \ + wpa_supplicant -B -i $1 -c $BSDINSTALL_TMPETC/wpa_supplicant.conf)) || \ + (dialog --backtitle "FreeBSD Installer" --title "Error" --msgbox \ + "Could not start wpa_supplicant!" 0 0; exit 1) || exit 1 + +# See if we succeeded +wpa_cli ping >/dev/null 2>/dev/null +if [ $? -ne 0 -a -z $BSDINSTALL_CONFIGCURRENT ]; then + dialog --backtitle "FreeBSD Installer" --title "Error" --msgbox \ + "Wireless cannot be configured without making changes to the local system!" \ 0 0 + exit 1 +fi + +wpa_cli scan >>$BSDINSTALL_LOG +dialog --backtitle "FreeBSD Installer" --title "Scanning" --ok-label "Skip" \ + --pause "Waiting 5 seconds to scan for wireless networks..." \ + 9 40 5 || exit 1 + +SCAN_RESULTS=`wpa_cli scan_results` +NETWORKS=`echo "$SCAN_RESULTS" | awk -F '\t' \ + '/..:..:..:..:..:../ {if (length($5) > 0) printf("\"%s\"\t%s\n", $5, $4);}' | + sort | uniq` + +exec 3>&1 +NETWORK=`sh -c "dialog --extra-button --extra-label \"Rescan\" \ + --backtitle \"FreeBSD Installer\" --title \"Network Selection\" --menu \ + \"Select a wireless network to connect to.\" 0 0 0 \ + $(echo $NETWORKS | tr '\n' ' ')" 2>&1 1>&3` +case $? in +0) # OK + ;; +1) # Cancel + exit 1 + ;; +3) # Rescan + exec $0 $@ + ;; +esac +exec 3>&- + +ENCRYPTION=`echo "$NETWORKS" | awk -F '\t' \ + "/^\"$NETWORK\"\t/ {printf(\"%s\n\", \\\$2 );}"` + +if echo $ENCRYPTION | grep -q 'PSK'; then + exec 3>&1 + PASS=`dialog --insecure --backtitle "FreeBSD Installer" \ + --title "WPA Setup" --mixedform "" 0 0 0 \ + "SSID" 1 0 "$NETWORK" 1 12 0 0 2 \ + "Password" 2 0 "" 2 12 15 0 1 \ + 2>&1 1>&3` \ + || exec $0 $@ + exec 3>&- +echo "network={ + ssid=\"$NETWORK\" + psk=\"$PASS\" + priority=5 +}" >> $BSDINSTALL_TMPETC/wpa_supplicant.conf +elif echo $ENCRYPTION | grep -q WEP; then + echo FOO + exec 3>&1 + WEPKEY=`dialog --insecure --backtitle "FreeBSD Installer" \ + --title "WEP Setup" --mixedform "" 0 0 0 \ + "SSID" 1 0 "$NETWORK" 1 12 0 0 2 \ + "WEP Key 0" 2 0 "" 2 12 15 0 1 \ + 2>&1 1>&3` \ + || exec $0 $@ +echo "network={ + ssid=\"$NETWORK\" + key_mgmt=NONE + wep_key0=\"$WEPKEY\" + wep_tx_keyidx=0 + priority=5 +}" >> $BSDINSTALL_TMPETC/wpa_supplicant.conf +else # Open +echo "network={ + ssid=\"$NETWORK\" + key_mgmt=NONE + priority=5 +}" >> $BSDINSTALL_TMPETC/wpa_supplicant.conf +fi + +# Connect to any open networks policy +echo "network={ + priority=5 + key_mgmt=NONE +}" >> $BSDINSTALL_TMPETC/wpa_supplicant.conf + +# Bring up new network +test ! -z $BSDINSTALL_CONFIGCURRENT && wpa_cli reconfigure >>$BSDINSTALL_LOG + +exit 0 From owner-svn-src-user@FreeBSD.ORG Sat Feb 5 16:37:36 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 62D52106566C; Sat, 5 Feb 2011 16:37:36 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 51AAB8FC1B; Sat, 5 Feb 2011 16:37:36 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p15GbaQU033882; Sat, 5 Feb 2011 16:37:36 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p15Gba3u033880; Sat, 5 Feb 2011 16:37:36 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201102051637.p15Gba3u033880@svn.freebsd.org> From: Nathan Whitehorn Date: Sat, 5 Feb 2011 16:37:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218332 - user/nwhitehorn/bsdinstall/scripts X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Feb 2011 16:37:36 -0000 Author: nwhitehorn Date: Sat Feb 5 16:37:36 2011 New Revision: 218332 URL: http://svn.freebsd.org/changeset/base/218332 Log: Show an error if no networks were found. Modified: user/nwhitehorn/bsdinstall/scripts/wlanconfig Modified: user/nwhitehorn/bsdinstall/scripts/wlanconfig ============================================================================== --- user/nwhitehorn/bsdinstall/scripts/wlanconfig Sat Feb 5 16:23:32 2011 (r218331) +++ user/nwhitehorn/bsdinstall/scripts/wlanconfig Sat Feb 5 16:37:36 2011 (r218332) @@ -34,6 +34,13 @@ NETWORKS=`echo "$SCAN_RESULTS" | awk -F '/..:..:..:..:..:../ {if (length($5) > 0) printf("\"%s\"\t%s\n", $5, $4);}' | sort | uniq` +if [ -z $SCAN_RESULTS ]; then + dialog --backtitle "FreeBSD Installer" --title "Error" \ + --yesno "No wireless networks were found. Rescan?" 0 0 && \ + exec $0 $@ + exit 1 +fi + exec 3>&1 NETWORK=`sh -c "dialog --extra-button --extra-label \"Rescan\" \ --backtitle \"FreeBSD Installer\" --title \"Network Selection\" --menu \ From owner-svn-src-user@FreeBSD.ORG Sat Feb 5 17:05:29 2011 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A66A8106564A; Sat, 5 Feb 2011 17:05:29 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9540C8FC0A; Sat, 5 Feb 2011 17:05:29 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p15H5T6U034618; Sat, 5 Feb 2011 17:05:29 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p15H5TuS034616; Sat, 5 Feb 2011 17:05:29 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201102051705.p15H5TuS034616@svn.freebsd.org> From: Nathan Whitehorn Date: Sat, 5 Feb 2011 17:05:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-user@freebsd.org X-SVN-Group: user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r218333 - user/nwhitehorn/bsdinstall/scripts X-BeenThere: svn-src-user@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the experimental " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 05 Feb 2011 17:05:29 -0000 Author: nwhitehorn Date: Sat Feb 5 17:05:29 2011 New Revision: 218333 URL: http://svn.freebsd.org/changeset/base/218333 Log: Don't show wlanX interfaces separately from their parents. Modified: user/nwhitehorn/bsdinstall/scripts/netconfig Modified: user/nwhitehorn/bsdinstall/scripts/netconfig ============================================================================== --- user/nwhitehorn/bsdinstall/scripts/netconfig Sat Feb 5 16:37:36 2011 (r218332) +++ user/nwhitehorn/bsdinstall/scripts/netconfig Sat Feb 5 17:05:29 2011 (r218333) @@ -13,11 +13,11 @@ DIALOG_TAGS="" echo -n > $BSDINSTALL_TMPETC/rc.conf.net for IF in `ifconfig -l`; do - if [ $IF != "lo0" ]; then - INTERFACES="$INTERFACES $IF" - DESC=`sysctl -n dev.$(echo $IF | sed -E 's/([[:alpha:]]*)([[:digit:]]*)/\1.\2/g').%desc` - DIALOG_TAGS="$DIALOG_TAGS $IF \"$DESC\"" - fi + test "$IF" = "lo0" && continue + (ifconfig -g wlan | egrep -wq $IF) && continue + INTERFACES="$INTERFACES $IF" + DESC=`sysctl -n dev.$(echo $IF | sed -E 's/([[:alpha:]]*)([[:digit:]]*)/\1.\2/g').%desc` + DIALOG_TAGS="$DIALOG_TAGS $IF \"$DESC\"" done exec 3>&1