From owner-svn-src-user@FreeBSD.ORG  Sat Feb  5 17:05:29 2011
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
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 <nwhitehorn@FreeBSD.org>
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 &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=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