When netbooting, rootspec is now "md0a", and it has no chance to match
an interface name, so do not give it a try.
This commit is contained in:
parent
6218a6dafa
commit
61a1c8cdd1
|
@ -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.
|
* Copyright (c) 2007 Emmanuel Dreyfus, all rights reserved.
|
||||||
|
@ -39,7 +39,7 @@
|
||||||
#include "opt_md.h"
|
#include "opt_md.h"
|
||||||
|
|
||||||
#include <sys/cdefs.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/param.h>
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
|
@ -129,11 +129,7 @@ tftproot_dhcpboot(struct device *bootdv)
|
||||||
struct device *dv;
|
struct device *dv;
|
||||||
int error = -1;
|
int error = -1;
|
||||||
|
|
||||||
if (rootspec != NULL) {
|
if ((bootdv != NULL && device_class(bootdv) == DV_IFNET)) {
|
||||||
IFNET_FOREACH(ifp)
|
|
||||||
if (strcmp(rootspec, ifp->if_xname) == 0)
|
|
||||||
break;
|
|
||||||
} else if ((bootdv != NULL && device_class(bootdv) == DV_IFNET)) {
|
|
||||||
IFNET_FOREACH(ifp)
|
IFNET_FOREACH(ifp)
|
||||||
if (strcmp(device_xname(bootdv), ifp->if_xname) == 0)
|
if (strcmp(device_xname(bootdv), ifp->if_xname) == 0)
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in New Issue