airship
/
image-builder
Code Issues Proposed changes

Merge "Make grub timeout configurable and set to 0"

This commit is contained in:
Zuul 2021-11-02 18:02:01 +00:00 committed by Gerrit Code Review
parent 1f7138684d c5961decad
commit da905e0e5d
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
image-builder/assets/playbooks/roles/livecdcontent/defaults/main.yaml
View File

@ -4,3 +4,4 @@ root_image: build
mksquashfs_compression: lz4
mksquashfs_threads: "{{ ansible_processor_vcpus }}"
squashfs_timeout: 120
grub_menu_timeout: 0

2
image-builder/assets/playbooks/roles/livecdcontent/templates/grub-livecd.cfg.j2
View File

@ -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