Module Name: src
Committed By: matt
Date: Wed Jun 10 22:33:06 UTC 2015
Modified Files:
src/sys/arch/evbmips/rmixl: autoconf.c
Log Message:
Match sd and ld in addition to wd.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbmips/rmixl/autoconf.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/arch/evbmips/rmixl/autoconf.c
diff -u src/sys/arch/evbmips/rmixl/autoconf.c:1.7 src/sys/arch/evbmips/rmixl/autoconf.c:1.8
--- src/sys/arch/evbmips/rmixl/autoconf.c:1.7 Sat Oct 27 17:17:51 2012
+++ src/sys/arch/evbmips/rmixl/autoconf.c Wed Jun 10 22:33:06 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.7 2012/10/27 17:17:51 chs Exp $ */
+/* $NetBSD: autoconf.c,v 1.8 2015/06/10 22:33:06 matt Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.7 2012/10/27 17:17:51 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.8 2015/06/10 22:33:06 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -83,17 +83,19 @@ extern int netboot;
static void
findroot(void)
{
- device_t dv;
- deviter_t di;
-
if (booted_device)
return;
if ((booted_device == NULL) && netboot == 0) {
+ device_t dv;
+ deviter_t di;
+
for (dv = deviter_first(&di, DEVITER_F_ROOT_FIRST); dv != NULL;
dv = deviter_next(&di)) {
- if (device_class(dv) == DV_DISK &&
- device_is_a(dv, "wd"))
+ if (device_class(dv) == DV_DISK
+ && (device_is_a(dv, "wd")
+ || device_is_a(dv, "sd")
+ || device_is_a(dv, "ld")))
booted_device = dv;
}
deviter_release(&di);
