Source-Changes-HG archive

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

[src/trunk]: src/sys/arch/evbmips/rmixl Match sd and ld in addition to wd.



details:   https://anonhg.NetBSD.org/src/rev/f9a85f14b081
branches:  trunk
changeset: 338828:f9a85f14b081
user:      matt <matt%NetBSD.org@localhost>
date:      Wed Jun 10 22:33:06 2015 +0000

description:
Match sd and ld in addition to wd.

diffstat:

 sys/arch/evbmips/rmixl/autoconf.c |  16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diffs (43 lines):

diff -r 18620a3cac41 -r f9a85f14b081 sys/arch/evbmips/rmixl/autoconf.c
--- a/sys/arch/evbmips/rmixl/autoconf.c Wed Jun 10 22:32:32 2015 +0000
+++ b/sys/arch/evbmips/rmixl/autoconf.c Wed Jun 10 22:33:06 2015 +0000
@@ -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 @@
 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);



Home | Main Index | Thread Index | Old Index