Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/kern When netbooting, rootspec is now "md0a", and it has...



details:   https://anonhg.NetBSD.org/src/rev/80f3ced8b834
branches:  trunk
changeset: 746844:80f3ced8b834
user:      manu <manu%NetBSD.org@localhost>
date:      Fri Aug 21 09:20:47 2009 +0000

description:
When netbooting, rootspec is now "md0a", and it has no chance to match
an interface name, so do not give it a try.

diffstat:

 sys/kern/subr_tftproot.c |  10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diffs (31 lines):

diff -r f52579befef9 -r 80f3ced8b834 sys/kern/subr_tftproot.c
--- a/sys/kern/subr_tftproot.c  Fri Aug 21 08:42:02 2009 +0000
+++ b/sys/kern/subr_tftproot.c  Fri Aug 21 09:20:47 2009 +0000
@@ -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;



Home | Main Index | Thread Index | Old Index