Skip site navigation (1)Skip section navigation (2) 
Date:      Fri, 22 May 2009 21:26:34 +0000 (UTC)
From:      Colin Percival <cperciva@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
Subject:   svn commit: r192602 - stable/7/usr.sbin/sysinstall
Message-ID:  <200905222126.n4MLQZNG019314@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help 
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;

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200905222126.n4MLQZNG019314>