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;
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
