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

* docs/grub.texi (Simple configuration): Clarify GRUB_HIDDEN_TIMEOUT 

is interrupted by ESC.
This commit is contained in:
Andrey Borzenkov 2013-01-20 22:42:08 +01:00 committed by Vladimir 'phcoder' Serbinenko
parent 08dad2dcf9
commit 8eb8284d2d
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2013-01-20 Andrey Borzenkov <arvidjaar@gmail.com>
* docs/grub.texi (Simple configuration): Clarify GRUB_HIDDEN_TIMEOUT
is interrupted by ESC.
2013-01-20 Vladimir Serbinenko <phcoder@gmail.com>
* util/grub-script-check.c (main): Uniform the error message.

7
docs/grub.texi
View File

@ -1201,11 +1201,12 @@ immediately without displaying the menu, or to @samp{-1} to wait
indefinitely.
@item GRUB_HIDDEN_TIMEOUT
Wait this many seconds for a key to be pressed before displaying the menu.
If no key is pressed during that time, display the menu for the number of
Wait this many seconds for @key{ESC} to be pressed before displaying the menu.
If no @key{ESC} 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.
to @samp{0} so that the menu is not displayed at all unless @key{ESC} is
pressed.
Unset by default.
@item GRUB_HIDDEN_TIMEOUT_QUIET