[src/netbsd-9]: src/sys/kern Pull up following revision(s) (requested by tsut...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e2bd1ef0f923
branches:  netbsd-9
changeset: 953309:e2bd1ef0f923
user:      martin <martin%NetBSD.org@localhost>
date:      Fri Mar 05 13:48:27 2021 +0000

description:
Pull up following revision(s) (requested by tsutsui in ticket #1222):

        sys/kern/kern_subr.c: revision 1.229

Restore missing message for RB_ASKNAME.
Cleanups.

diffstat:

 sys/kern/kern_subr.c |  18 +++++++++++++++---
 1 files changed, 15 insertions(+), 3 deletions(-)

diffs (40 lines):

diff -r c6e83ecf5168 -r e2bd1ef0f923 sys/kern/kern_subr.c
--- a/sys/kern/kern_subr.c      Fri Mar 05 13:34:19 2021 +0000
+++ b/sys/kern/kern_subr.c      Fri Mar 05 13:48:27 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_subr.c,v 1.223.4.1 2019/09/17 19:45:03 martin Exp $       */
+/*     $NetBSD: kern_subr.c,v 1.223.4.2 2021/03/05 13:48:27 martin Exp $       */
 
 /*-
  * Copyright (c) 1997, 1998, 1999, 2002, 2007, 2008 The NetBSD Foundation, Inc.
@@ -79,7 +79,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_subr.c,v 1.223.4.1 2019/09/17 19:45:03 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_subr.c,v 1.223.4.2 2021/03/05 13:48:27 martin Exp $");
 
 #include "opt_ddb.h"
 #include "opt_md.h"
@@ -442,8 +442,20 @@
                }
        }
 
+       switch (device_class(rootdv)) {
+       case DV_IFNET:
+       case DV_DISK:
+               aprint_normal("root on %s", device_xname(rootdv));
+               if (DEV_USES_PARTITIONS(rootdv))
+                       aprint_normal("%c", (int)DISKPART(rootdev) + 'a');
+               break;
+       default:
+               printf("can't determine root device\n");
+               return;
+       }
+
        root_device = rootdv;
-       setroot_dump(root_device, dumpdv);
+       setroot_dump(rootdv, dumpdv);
 }
 
 /*