Skip to content

feat(uefi): prefer loading kernels from \EFI\hermit #563

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mkroening wants to merge 2 commits into
base: main
Choose a base branch
from
Open

feat(uefi): prefer loading kernels from \EFI\hermit #563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
630f145
feat(uefi): prefer booting from `\EFI\hermit`
mkroening Feb 15, 2026
5af5173
fix(xtask): move hermit app to `\EFI\hermit`
mkroening Feb 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/os/uefi/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,11 +135,14 @@ impl Esp {
}

pub fn read_app(&mut self) -> Vec<u8> {
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<String> {
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<P: AsRef<Path>>(&mut self, path: P) -> Option<Vec<u8>> {
Expand Down
4 changes: 3 additions & 1 deletion xtask/src/ci/qemu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 => {
Expand Down