Module Name: src
Committed By: martin
Date: Wed Feb 22 13:28:02 UTC 2023
Modified Files:
src/sys/kern [netbsd-10]: kern_subr.c
Log Message:
Pull up following revision(s) (requested by mlelstv in ticket #96):
sys/kern/kern_subr.c: revision 1.231
If a specified root device does not exist when the kernel tries to
mount the root filesystem, retry for up to ROOT_WAITTIME (20) seconds.
This helps for root on hot-plug devices like USB disks.
To generate a diff of this commit:
cvs rdiff -u -r1.230 -r1.230.4.1 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.230 src/sys/kern/kern_subr.c:1.230.4.1
--- src/sys/kern/kern_subr.c:1.230 Sat Mar 19 13:51:35 2022
+++ src/sys/kern/kern_subr.c Wed Feb 22 13:28:01 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_subr.c,v 1.230 2022/03/19 13:51:35 hannken Exp $ */
+/* $NetBSD: kern_subr.c,v 1.230.4.1 2023/02/22 13:28:01 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.230 2022/03/19 13:51:35 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_subr.c,v 1.230.4.1 2023/02/22 13:28:01 martin Exp $");
#include "opt_ddb.h"
#include "opt_md.h"
@@ -174,6 +174,13 @@ uint64_t booted_nblks;
char *bootspec;
/*
+ * Time to wait for a specified boot device to appear.
+ */
+#ifndef ROOT_WAITTIME
+#define ROOT_WAITTIME 20
+#endif
+
+/*
* Use partition letters if it's a disk class but not a wedge or flash.
* XXX Check for wedge/flash is kinda gross.
*/
@@ -185,6 +192,7 @@ char *bootspec;
void
setroot(device_t bootdv, int bootpartition)
{
+ time_t waitend;
/*
* Let bootcode augment "rootspec", ensure that
@@ -241,14 +249,19 @@ setroot(device_t bootdv, int bootpartiti
/*
* loop until a root device is specified
*/
+ waitend = time_uptime + ROOT_WAITTIME;
do {
if (boothowto & RB_ASKNAME)
setroot_ask(bootdv, bootpartition);
- else
+ else {
setroot_root(bootdv, bootpartition);
-
- if (root_device == NULL)
- boothowto |= RB_ASKNAME;
+ if (root_device == NULL) {
+ if (time_uptime < waitend) {
+ kpause("root", false, hz, NULL);
+ } else
+ boothowto |= RB_ASKNAME;
+ }
+ }
} while (root_device == NULL);
}
