From c5961decadea31446f8591fa9124d59e5e92fd8b Mon Sep 17 00:00:00 2001 From: "Anderson, Craig (ca846m)" Date: Mon, 1 Nov 2021 12:08:22 -0700 Subject: [PATCH] Make grub timeout configurable and set to 0 There are situations where it is possible for grub to get stuck waiting for user input, e.g. if no keyboard is connected or if there is any other keypress during the grub menu countdown. Changing the timeout to 0 prevents this. This is also made into a configurable parameter in case someone needs to use a non-zero value for troubleshooting. This only applies to the ephemeral ISO. Change-Id: I34848b7fc56c5698fd3c408bf82ace53e5366d13 --- .../assets/playbooks/roles/livecdcontent/defaults/main.yaml | 1 + .../playbooks/roles/livecdcontent/templates/grub-livecd.cfg.j2 | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/image-builder/assets/playbooks/roles/livecdcontent/defaults/main.yaml b/image-builder/assets/playbooks/roles/livecdcontent/defaults/main.yaml index c7a0ba9..f70314a 100644 --- a/image-builder/assets/playbooks/roles/livecdcontent/defaults/main.yaml +++ b/image-builder/assets/playbooks/roles/livecdcontent/defaults/main.yaml @@ -4,3 +4,4 @@ root_image: build mksquashfs_compression: lz4 mksquashfs_threads: "{{ ansible_processor_vcpus }}" squashfs_timeout: 120 +grub_menu_timeout: 0 diff --git a/image-builder/assets/playbooks/roles/livecdcontent/templates/grub-livecd.cfg.j2 b/image-builder/assets/playbooks/roles/livecdcontent/templates/grub-livecd.cfg.j2 index 60c2746..10b1218 100644 --- a/image-builder/assets/playbooks/roles/livecdcontent/templates/grub-livecd.cfg.j2 +++ b/image-builder/assets/playbooks/roles/livecdcontent/templates/grub-livecd.cfg.j2 @@ -3,7 +3,7 @@ search --set=root --file /AIRSHIP insmod all_video set default="0" -set timeout=1 +set timeout={{ grub_menu_timeout }} menuentry "Airship Ephemeral" { linux /boot/vmlinuz boot=live quiet nomodeset overlay-size=70% systemd.unified_cgroup_hierarchy=0 ds=ConfigDrive console=ttyS0 console=tty0