Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
mlelstv 2023-01-19 07:40:58 +00:00
parent 7cfe05bb83
commit 38ae6e1dbc
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sys/kern/kern_subr.c
View File

@ -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.231 2023/01/19 07:40:58 mlelstv 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.231 2023/01/19 07:40:58 mlelstv Exp $");
#include "opt_ddb.h"
#include "opt_md.h"
@ -173,6 +173,13 @@ daddr_t booted_startblk;
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 bootpartition)
/*
* 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)
if (root_device == NULL) {
if (time_uptime < waitend) {
kpause("root", false, hz, NULL);
} else
boothowto |= RB_ASKNAME;
}
}
} while (root_device == NULL);
}