From 5f81a99d219df9b912f17565089d68b3bcc5537d Mon Sep 17 00:00:00 2001 From: Alex Zenla Date: Sun, 4 Oct 2026 14:46:35 -0700 Subject: [PATCH] fix(boot): keep the one-shot entry as default when the menu is forced --- crates/boot/src/main.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/crates/boot/src/main.rs b/crates/boot/src/main.rs index 4f8a808..ef7e97a 100644 --- a/crates/boot/src/main.rs +++ b/crates/boot/src/main.rs @@ -506,8 +506,9 @@ fn run(reboot_on_error: &mut bool) -> Result<()> { // The preferred entry sources never use an entry with no boot counter tries left. // Each source has whether it matches by id, and whether it skips bad entries. // In strict mode, the one-shot entry is the default entry for this boot, like in - // systemd-boot, and the menu or its timeout still decides what is booted. - let oneshot_source = if strict { + // systemd-boot, and the menu or its timeout still decides what is booted. This also holds + // when the menu is forced, as the one-shot entry is then not booted at once. + let oneshot_source = if strict || force_boot_menu { bootloader_interface_oneshot_entry.clone() } else { None