Module Name: src Committed By: manu Date: Fri Aug 21 09:20:48 UTC 2009
Modified Files: src/sys/kern: subr_tftproot.c Log Message: When netbooting, rootspec is now "md0a", and it has no chance to match an interface name, so do not give it a try. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/kern/subr_tftproot.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/kern/subr_tftproot.c diff -u src/sys/kern/subr_tftproot.c:1.8 src/sys/kern/subr_tftproot.c:1.9 --- src/sys/kern/subr_tftproot.c:1.8 Wed Mar 18 16:00:21 2009 +++ src/sys/kern/subr_tftproot.c Fri Aug 21 09:20:47 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: subr_tftproot.c,v 1.8 2009/03/18 16:00:21 cegger Exp $ */ +/* $NetBSD: subr_tftproot.c,v 1.9 2009/08/21 09:20:47 manu Exp $ */ /*- * Copyright (c) 2007 Emmanuel Dreyfus, all rights reserved. @@ -39,7 +39,7 @@ #include "opt_md.h" #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: subr_tftproot.c,v 1.8 2009/03/18 16:00:21 cegger Exp $"); +__KERNEL_RCSID(0, "$NetBSD: subr_tftproot.c,v 1.9 2009/08/21 09:20:47 manu Exp $"); #include <sys/param.h> #include <sys/types.h> @@ -129,11 +129,7 @@ struct device *dv; int error = -1; - if (rootspec != NULL) { - IFNET_FOREACH(ifp) - if (strcmp(rootspec, ifp->if_xname) == 0) - break; - } else if ((bootdv != NULL && device_class(bootdv) == DV_IFNET)) { + if ((bootdv != NULL && device_class(bootdv) == DV_IFNET)) { IFNET_FOREACH(ifp) if (strcmp(device_xname(bootdv), ifp->if_xname) == 0) break;