diff options
| author | Navdeep Parhar <np@FreeBSD.org> | 2026-03-20 00:39:17 +0000 |
|---|---|---|
| committer | Navdeep Parhar <np@FreeBSD.org> | 2026-04-01 19:04:38 +0000 |
| commit | a4a3825d3e1dff1fea1d81443e0d92af6671a0c3 (patch) | |
| tree | b27620257e7a4f9f9963114e1f4775a12bb68dad | |
| parent | 7d069d7846519eb015133758647ee343e7d7f20a (diff) | |
loader(8): embedded MD should be the most preferred currdev
A loader built with MD_IMAGE_SIZE is almost always meant for use with
its embedded image and should try that as currdev before anything else.
Recent changes (d69fc3a9dc71, 784150fd2535) seem to have relaxed the ZFS
code's search for a rootfs and exposed this problem.
Reviewed by: imp, tsoome
Sponsored by: Chelsio Communications
Differential Revision: https://reviews.freebsd.org/D55979
(cherry picked from commit 0661997cea165e951e4e215e6aed41596d8b1d52)
| -rw-r--r-- | stand/efi/loader/main.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c index 1df1547f23b8..d6a42c0241fc 100644 --- a/stand/efi/loader/main.c +++ b/stand/efi/loader/main.c @@ -555,6 +555,15 @@ find_currdev(bool do_bootmgr, bool is_last, } /* Nothing specified, try normal match */ } +#ifdef MD_IMAGE_SIZE + /* + * If there is an embedded MD, try to use that. + */ + printf("Trying MD\n"); + if (probe_md_currdev()) + return (0); +#endif /* MD_IMAGE_SIZE */ + #ifdef EFI_ZFS_BOOT /* * Did efi_zfs_probe() detect the boot pool? If so, use the zpool @@ -570,15 +579,6 @@ find_currdev(bool do_bootmgr, bool is_last, } #endif /* EFI_ZFS_BOOT */ -#ifdef MD_IMAGE_SIZE - /* - * If there is an embedded MD, try to use that. - */ - printf("Trying MD\n"); - if (probe_md_currdev()) - return (0); -#endif /* MD_IMAGE_SIZE */ - /* * Try to find the block device by its handle based on the * image we're booting. If we can't find a sane partition, |