git: d9288e8fcccd - stable/14 - loader/efi: Small diff reduction
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 16 Apr 2024 20:13:26 UTC
The branch stable/14 has been updated by imp:
URL: https://cgit.FreeBSD.org/src/commit/?id=d9288e8fcccddfd230c8b3d5eec74f95910d04e4
commit d9288e8fcccddfd230c8b3d5eec74f95910d04e4
Author: Warner Losh <imp@FreeBSD.org>
AuthorDate: 2024-02-29 16:14:41 +0000
Commit: Warner Losh <imp@FreeBSD.org>
CommitDate: 2024-04-16 19:54:28 +0000
loader/efi: Small diff reduction
Make doing the boot once protocol more similar to copies of this code.
Sponsored by: Netflix
Reviewed by: manu
Differential Revision: https://reviews.freebsd.org/D44007
(cherry picked from commit 2425dbdff3d7c23f464262517faf1f99a1b51165)
---
stand/efi/loader/main.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/stand/efi/loader/main.c b/stand/efi/loader/main.c
index 12efe594e0e2..e4d62f2e940c 100644
--- a/stand/efi/loader/main.c
+++ b/stand/efi/loader/main.c
@@ -261,8 +261,9 @@ probe_zfs_currdev(uint64_t guid)
currdev.dd.d_unit = 0;
currdev.pool_guid = guid;
currdev.root_guid = 0;
- set_currdev_devdesc((struct devdesc *)&currdev);
devname = devformat(&currdev.dd);
+ set_currdev(devname);
+ printf("Setting currdev to %s\n", devname);
init_zfs_boot_options(devname);
if (zfs_get_bootonce(&currdev, OS_BOOTONCE, buf, sizeof(buf)) == 0) {