vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* docs/grub.texi Fix documentation of GRUB_HIDDEN_TIMOUNT to match the

Browse source 
actual implementation. Specifically, clarify that the grub menu will
       be displayed for GRUB_TIMOUT seconds after the hidden timeout has
       passed.
This commit is contained in:
Jordan Uggla 2012-05-21 23:04:11 +02:00 • committed by Vladimir 'phcoder' Serbinenko
parent dcaaae9dbe
commit 34274d0257
2 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2012-05-21 Jordan Uggla <jordan.uggla@gmail.com>
* docs/grub.texi Fix documentation of GRUB_HIDDEN_TIMOUNT to match the
actual implementation. Specifically, clarify that the grub menu will
be displayed for GRUB_TIMOUT seconds after the hidden timeout has
passed.
2012-05-21 Benjamin Herrenschmidt <benh@kernel.crashing.org> 2012-05-21 Benjamin Herrenschmidt <benh@kernel.crashing.org>
* grub-core/kern/powerpc/dl.c (trampoline_template): Use r12 instead * grub-core/kern/powerpc/dl.c (trampoline_template): Use r12 instead

6
docs/grub.texi
View file

@ -1135,7 +1135,11 @@ indefinitely.
@item GRUB_HIDDEN_TIMEOUT @item GRUB_HIDDEN_TIMEOUT
Wait this many seconds for a key to be pressed before displaying the menu. Wait this many seconds for a key to be pressed before displaying the menu.
If no key is pressed during that time, boot immediately. Unset by default. If no key is pressed during that time, display the menu for the number of
seconds specified in GRUB_TIMEOUT before booting the default entry. We expect
that most people who use GRUB_HIDDEN_TIMEOUT will want to have GRUB_TIMEOUT set
to @samp{0} so that the menu is not displayed at all unless a key is pressed.
Unset by default.
@item GRUB_HIDDEN_TIMEOUT_QUIET @item GRUB_HIDDEN_TIMEOUT_QUIET
In conjunction with @samp{GRUB_HIDDEN_TIMEOUT}, set this to @samp{true} to In conjunction with @samp{GRUB_HIDDEN_TIMEOUT}, set this to @samp{true} to