From owner-svn-src-all@FreeBSD.ORG  Fri May 22 21:26:35 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 324ED1065674;
	Fri, 22 May 2009 21:26:35 +0000 (UTC)
	(envelope-from cperciva@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 1EC558FC0C;
	Fri, 22 May 2009 21:26:35 +0000 (UTC)
	(envelope-from cperciva@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n4MLQZSO019315;
	Fri, 22 May 2009 21:26:35 GMT
	(envelope-from cperciva@svn.freebsd.org)
Received: (from cperciva@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n4MLQZNG019314;
	Fri, 22 May 2009 21:26:35 GMT
	(envelope-from cperciva@svn.freebsd.org)
Message-Id: <200905222126.n4MLQZNG019314@svn.freebsd.org>
From: Colin Percival <cperciva@FreeBSD.org>
Date: Fri, 22 May 2009 21:26:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r192602 - stable/7/usr.sbin/sysinstall
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 22 May 2009 21:26:36 -0000

Author: cperciva
Date: Fri May 22 21:26:34 2009
New Revision: 192602
URL: http://svn.freebsd.org/changeset/base/192602

Log:
  MFC r192130:
    Allow a comma-separated list of network interfaces to be specified via the
    netDev option in install.cfg.

Modified:
  stable/7/usr.sbin/sysinstall/   (props changed)
  stable/7/usr.sbin/sysinstall/tcpip.c

Modified: stable/7/usr.sbin/sysinstall/tcpip.c
==============================================================================
--- stable/7/usr.sbin/sysinstall/tcpip.c	Fri May 22 20:55:29 2009	(r192601)
+++ stable/7/usr.sbin/sysinstall/tcpip.c	Fri May 22 21:26:34 2009	(r192602)
@@ -651,11 +651,26 @@ tcpDeviceSelect(void)
 {
     DMenu *menu;
     Device **devs, *rval;
+    char *dev, *network_dev;
     int cnt;
 
+    rval = NULL;
+
+    if (variable_get(VAR_NONINTERACTIVE) && variable_get(VAR_NETWORK_DEVICE)) {
+	network_dev = variable_get(VAR_NETWORK_DEVICE);
+
+	while ((dev = strsep(&network_dev, ",")) != NULL) {
+	    devs = deviceFind(dev, DEVICE_TYPE_NETWORK);
+	    cnt = deviceCount(devs);
+	    if (cnt) {
+		if (DITEM_STATUS(tcpOpenDialog(devs[0]) == DITEM_SUCCESS))
+		    return(devs[0]);
+	    }
+	}
+    }
+
     devs = deviceFind(variable_get(VAR_NETWORK_DEVICE), DEVICE_TYPE_NETWORK);
     cnt = deviceCount(devs);
-    rval = NULL;
 
     if (!cnt) {
 	msgConfirm("No network devices available!");
@@ -669,14 +684,6 @@ tcpDeviceSelect(void)
 	if (DITEM_STATUS(tcpOpenDialog(devs[0]) == DITEM_SUCCESS))
 	    rval = devs[0];
     }
-    else if (variable_get(VAR_NONINTERACTIVE) && variable_get(VAR_NETWORK_DEVICE)) {
-	devs = deviceFind(variable_get(VAR_NETWORK_DEVICE), DEVICE_TYPE_NETWORK);
-	cnt = deviceCount(devs);
-	if (cnt) {
-	    if (DITEM_STATUS(tcpOpenDialog(devs[0]) == DITEM_SUCCESS))
-		rval = devs[0];
-	}
-    }
     else {
 	int status;