Merge "Set grub timeout default"

This commit is contained in:
Jenkins 2016-12-20 22:45:07 +00:00 committed by Gerrit Code Review
commit c73e6b5ab1
3 changed files with 18 additions and 4 deletions

View File

@ -1,7 +1,14 @@
==========
bootloader
==========
Installs grub[2] on boot partition on the system. In case GRUB2
is not available in the system, a fallback to Extlinux will happen. It's
also possible to enforce the use of Extlinux by exporting a DIB_EXTLINUX
variable to the environment.
Installs ``grub[2]`` on boot partition on the system. In case GRUB2 is
not available in the system, a fallback to Extlinux will happen. It's
also possible to enforce the use of Extlinux by exporting a
``DIB_EXTLINUX`` variable to the environment.
Arguments
=========
* ``DIB_GRUB_TIMEOUT`` sets the ``grub`` menu timeout. It defaults to
5 seconds. Set this to 0 (no timeout) for fast boot times.

View File

@ -133,6 +133,7 @@ function install_grub2 {
GRUB_CFG=/boot/grub/grub.cfg
fi
echo "GRUB_TIMEOUT=${DIB_GRUB_TIMEOUT:-5}" >>/etc/default/grub
echo 'GRUB_TERMINAL="serial console"' >>/etc/default/grub
echo 'GRUB_GFXPAYLOAD_LINUX=text' >>/etc/default/grub
echo 'GRUB_CMDLINE_LINUX_DEFAULT="console=tty0 console=ttyS0,115200 no_timer_check"' >>/etc/default/grub

View File

@ -0,0 +1,6 @@
---
features:
- The ``bootloader`` element will explicitly set the timeout to
``5`` seconds when using ``grub`` (previously this was undefined,
but platform defaults were usually 5 seconds). Set this to ``0``
for faster boots.