diff mbox series

[wic] bootimg_efi: allow a systemd-boot timeout of 0

Message ID 20260928135236.89296-1-f_l_k@t-online.de
State New
Headers show
Series [wic] bootimg_efi: allow a systemd-boot timeout of 0 | expand

Commit Message

Markus Volk Sept. 28, 2026, 1:52 p.m. UTC
--timeout=0 was turned into the 5 second default because the value was
combined with "or", so systemd-boot could not be told to skip the menu.
Fall back to 5 only when no timeout is given. Tested with a Raspberry
Pi 4 image: loader.conf gets "timeout 0" and systemd-boot starts the
default entry without showing the menu.

AI-Generated: Uses Claude Code (Claude Opus 5.5)
Signed-off-by: Markus Volk <f_l_k@t-online.de>
---
 src/wic/plugins/source/bootimg_efi.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/src/wic/plugins/source/bootimg_efi.py b/src/wic/plugins/source/bootimg_efi.py
index fe6c222..7274249 100644
--- a/src/wic/plugins/source/bootimg_efi.py
+++ b/src/wic/plugins/source/bootimg_efi.py
@@ -145,7 +145,8 @@  class BootimgEFIPlugin(SourcePlugin):
         loader_conf = ""
 
         # 5 seconds is a sensible default timeout
-        loader_conf += "timeout %d\n" % (bootloader.timeout or 5)
+        timeout = 5 if bootloader.timeout is None else bootloader.timeout
+        loader_conf += "timeout %d\n" % timeout
 
         logger.debug("Writing systemd-boot config "
                      "%s/hdd/boot/loader/loader.conf", cr_workdir)