feat(uefi): prefer booting from \EFI\hermit

mkroening · mkroening · commit 630f14595bdf · 2026-02-18T16:23:05.000+01:00
diff --git 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<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>> {

Original file line number	Diff line number	Diff line change
`@@ -135,11 +135,14 @@ impl Esp {`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`pub fn read_app(&mut self) -> Vec<u8> {`
`138`		`- self.read_app_at(cstr16!(r"\EFI\BOOT\hermit-app")).unwrap()`
	`138`	`+ self.read_app_at(cstr16!(r"\EFI\hermit\hermit-app"))`
	`139`	`+ .or_else(\|\| self.read_app_at(cstr16!(r"\EFI\BOOT\hermit-app")))`
	`140`	`+ .unwrap()`
`139`	`141`	`}`
`140`	`142`
`141`	`143`	`pub fn read_bootargs(&mut self) -> Option<String> {`
`142`		`- self.read_bootargs_at(cstr16!(r"\EFI\BOOT\hermit-bootargs"))`
	`144`	`+ self.read_bootargs_at(cstr16!(r"\EFI\hermit\hermit-bootargs"))`
	`145`	`+ .or_else(\|\| self.read_bootargs_at(cstr16!(r"\EFI\BOOT\hermit-bootargs")))`
`143`	`146`	`}`
`144`	`147`
`145`	`148`	`fn read_app_at<P: AsRef<Path>>(&mut self, path: P) -> Option<Vec<u8>> {`