svn commit: r218333 - user/nwhitehorn/bsdinstall/scripts

[Nathan Whitehorn]

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