openstack/diskimage-builder
Code Issues Proposed changes

Merge "Set grub timeout style"

Browse Source
This commit is contained in:
Zuul 2023-09-20 23:09:34 +00:00 committed by Gerrit Code Review
commit 64a38a518d
3 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
diskimage_builder/elements/bootloader/README.rst
View File

@ -10,6 +10,11 @@ Arguments
* ``DIB_GRUB_TIMEOUT`` sets the ``grub`` menu timeout. It defaults to * ``DIB_GRUB_TIMEOUT`` sets the ``grub`` menu timeout. It defaults to
5 seconds. Set this to 0 (no timeout) for fast boot times. 5 seconds. Set this to 0 (no timeout) for fast boot times.
* ``DIB_GRUB_TIMEOUT_STYLE`` sets the visibility of the ``grub`` menu.
It defaults to ``hidden`` (or ``countdown`` as an alias). Set this to
``menu`` to display the menu and then wait for the timeout set by
``DIB_GRUB_TIMEOUT`` to expire before booting the default entry.
* ``DIB_BOOTLOADER_DEFAULT_CMDLINE`` sets parameters that are appended * ``DIB_BOOTLOADER_DEFAULT_CMDLINE`` sets parameters that are appended
to the ``GRUB_CMDLINE_LINUX_DEFAULT`` values in ``grub.cfg`` to the ``GRUB_CMDLINE_LINUX_DEFAULT`` values in ``grub.cfg``
configuration. It defaults to ``nofb nomodeset gfxpayload=text``. configuration. It defaults to ``nofb nomodeset gfxpayload=text``.

1
diskimage_builder/elements/bootloader/finalise.d/50-bootloader
View File

@ -85,6 +85,7 @@ fi
echo "GRUB_DEVICE=LABEL=${DIB_ROOT_LABEL}" >> /etc/default/grub echo "GRUB_DEVICE=LABEL=${DIB_ROOT_LABEL}" >> /etc/default/grub
echo 'GRUB_DISABLE_LINUX_UUID=true' >> /etc/default/grub echo 'GRUB_DISABLE_LINUX_UUID=true' >> /etc/default/grub
echo "GRUB_TIMEOUT=${DIB_GRUB_TIMEOUT:-5}" >>/etc/default/grub echo "GRUB_TIMEOUT=${DIB_GRUB_TIMEOUT:-5}" >>/etc/default/grub
echo "GRUB_TIMEOUT_STYLE=${DIB_GRUB_TIMEOUT_STYLE:-hidden}" >>/etc/default/grub
echo 'GRUB_TERMINAL="serial console"' >>/etc/default/grub echo 'GRUB_TERMINAL="serial console"' >>/etc/default/grub
echo 'GRUB_GFXPAYLOAD_LINUX=auto' >>/etc/default/grub echo 'GRUB_GFXPAYLOAD_LINUX=auto' >>/etc/default/grub

7
releasenotes/notes/grub-timeout-style-4bb9b2bde4ff2b02.yaml Normal file
View File

@ -0,0 +1,7 @@
---
features:
- |
The ``bootloader`` element will explicitly set the timeout style to
``hidden`` to hide the menu. Set ``DIB_GRUB_TIMEOUT_STYLE`` to ``menu``
to display the menu and then wait for the timeout expire before booting
the default entry.