Module Name: src
Committed By: manu
Date: Sun Aug 23 12:10:50 UTC 2009
Modified Files:
src/sys/kern: subr_tftproot.c
Log Message:
Back out previous change: do not skip the test on rootspec, but make it
a simple attempt instead of an authoritative answer. The failure of the
rootspec test could me machine-dependant. Thanks to martin@ for pointing
that out.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 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.9 src/sys/kern/subr_tftproot.c:1.10
--- src/sys/kern/subr_tftproot.c:1.9 Fri Aug 21 09:20:47 2009
+++ src/sys/kern/subr_tftproot.c Sun Aug 23 12:10:50 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_tftproot.c,v 1.9 2009/08/21 09:20:47 manu Exp $ */
+/* $NetBSD: subr_tftproot.c,v 1.10 2009/08/23 12:10:50 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.9 2009/08/21 09:20:47 manu Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_tftproot.c,v 1.10 2009/08/23 12:10:50 manu Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -129,7 +129,14 @@
struct device *dv;
int error = -1;
- if ((bootdv != NULL && device_class(bootdv) == DV_IFNET)) {
+ if (rootspec != NULL) {
+ IFNET_FOREACH(ifp)
+ if (strcmp(rootspec, ifp->if_xname) == 0)
+ break;
+ }
+
+ if ((ifp == NULL) &&
+ (bootdv != NULL && device_class(bootdv) == DV_IFNET)) {
IFNET_FOREACH(ifp)
if (strcmp(device_xname(bootdv), ifp->if_xname) == 0)
break;
