From 630f14595bdfd4ae3d988f822547ae40f7dc2c73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= Date: Sun, 15 Feb 2026 10:53:35 +0100 Subject: [PATCH 1/2] feat(uefi): prefer booting from `\EFI\hermit` --- src/os/uefi/mod.rs | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/os/uefi/mod.rs b/src/os/uefi/mod.rs index 52f90a46..63b59263 100644 --- a/src/os/uefi/mod.rs +++ b/src/os/uefi/mod.rs @@ -135,11 +135,14 @@ impl Esp { } pub fn read_app(&mut self) -> Vec { - self.read_app_at(cstr16!(r"\EFI\BOOT\hermit-app")).unwrap() + self.read_app_at(cstr16!(r"\EFI\hermit\hermit-app")) + .or_else(|| self.read_app_at(cstr16!(r"\EFI\BOOT\hermit-app"))) + .unwrap() } pub fn read_bootargs(&mut self) -> Option { - self.read_bootargs_at(cstr16!(r"\EFI\BOOT\hermit-bootargs")) + self.read_bootargs_at(cstr16!(r"\EFI\hermit\hermit-bootargs")) + .or_else(|| self.read_bootargs_at(cstr16!(r"\EFI\BOOT\hermit-bootargs"))) } fn read_app_at>(&mut self, path: P) -> Option> { From 5af5173ff3d34b0c0158c0ef6a8875189684b3a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Kr=C3=B6ning?= Date: Sun, 15 Feb 2026 10:54:43 +0100 Subject: [PATCH 2/2] fix(xtask): move hermit app to `\EFI\hermit` --- xtask/src/ci/qemu.rs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xtask/src/ci/qemu.rs b/xtask/src/ci/qemu.rs index e18b3e41..d989d280 100644 --- a/xtask/src/ci/qemu.rs +++ b/xtask/src/ci/qemu.rs @@ -89,9 +89,11 @@ impl Qemu { // EDK II: https://github.com/tianocore/edk2/blob/edk2-stable202511/MdePkg/Include/Uefi/UefiSpec.h#L2264-L2273 sh.create_dir("target/esp/EFI/BOOT")?; sh.copy_file(self.build.dist_object(), "target/esp/EFI/BOOT/BOOTX64.EFI")?; + + sh.create_dir("target/esp/EFI/hermit")?; sh.copy_file( self.build.ci_image(self.image.as_deref().unwrap()), - "target/esp/EFI/BOOT/hermit-app", + "target/esp/EFI/hermit/hermit-app", )?; } Target::Aarch64Elf | Target::Aarch64BeElf if self.u_boot => {