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

kboot: Use standard set_currdev

Browse Source 
Use the standard set_currdev instead of the (now very old) copy of
setting currdev and loaddev directly. We do this only when we don't go
find the ZFS pool to boot from.

Sponsored by:		Netflix
Reviewed by:		kevans
Differential Revision:	https://reviews.freebsd.org/D38012
This commit is contained in:
Warner Losh 2023-01-13 14:21:16 -07:00
parent b7ecfa195f
commit eb1795782c
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
stand/kboot/main.c
View File

@ -198,15 +198,22 @@ main(int argc, const char **argv)
* on active BEs, etc
*/
hostdisk_zfs_find_default();
}
} else
#endif
{
/*
* 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
* processing that would otherwise pick a different snapshot to
* boot than the default one in the pool.
*/
set_currdev(bootdev);
}
printf("Boot device: %s with hostfs_root %s\n", bootdev, hostfs_root);
printf("\n%s", bootprog_info);
setenv("currdev", bootdev, 1);
setenv("loaddev", bootdev, 1);
setenv("LINES", "24", 1);
setenv("usefdt", "1", 1);