d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kboot: Better default boot device

Browse Source 
Provide a better message when we can't find a boot device.

Sponsored by: Netflix
This commit is contained in:
Warner Losh 2023-03-02 10:55:06 -07:00
parent 6c47abb63b
commit 3a616b10d8
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
stand/kboot/main.c
View File

@ -232,23 +232,22 @@ main(int argc, const char **argv)
bootdev = getenv("bootdev");
if (bootdev == NULL)
bootdev = hostdisk_gen_probe();
if (bootdev == NULL)
bootdev="zfs:";
hostfs_root = getenv("hostfs_root");
if (hostfs_root == NULL)
hostfs_root = "/";
#if defined(LOADER_ZFS_SUPPORT)
if (strcmp(bootdev, "zfs:") == 0) {
if (bootdev == NULL || strcmp(bootdev, "zfs:") == 0) {
/*
* Pseudo device that says go find the right ZFS pool. This will be
* the first pool that we find that passes the sanity checks (eg looks
* like it might be vbootable) and sets currdev to the right thing based
* on active BEs, etc
*/
hostdisk_zfs_find_default();
} else
if (hostdisk_zfs_find_default())
bootdev = getenv("currdev");
}
#endif
{
if (bootdev != NULL) {
/*
* Otherwise, honor what's on the command line. If we've been
* given a specific ZFS partition, then we'll honor it w/o BE
@ -256,6 +255,8 @@ main(int argc, const char **argv)
* boot than the default one in the pool.
*/
set_currdev(bootdev);
} else {
panic("Bootdev is still NULL");
}
printf("Boot device: %s with hostfs_root %s\n", bootdev, hostfs_root);