Module Name: src
Committed By: martin
Date: Fri Mar 5 13:48:27 UTC 2021
Modified Files:
src/sys/kern [netbsd-9]: kern_subr.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.223.4.1 -r1.223.4.2 src/sys/kern/kern_subr.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/kern/kern_subr.c
diff -u src/sys/kern/kern_subr.c:1.223.4.1 src/sys/kern/kern_subr.c:1.223.4.2
--- src/sys/kern/kern_subr.c:1.223.4.1 Tue Sep 17 19:45:03 2019
+++ src/sys/kern/kern_subr.c Fri Mar 5 13:48:27 2021
@@ -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 @@ setroot_ask(device_t bootdv, int bootpar
}
}
+ 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);
}
/*
