On 04/29/2012 12:14 PM, Mads Kiilerich wrote: > * util/grub.d/00_header.in: Boot immediately after > GRUB_HIDDEN_TIMEOUT. Documentation said: "If no key is pressed > during that time, boot immediately." > > > > _______________________________________________ > Grub-devel mailing list > Grub-devel@gnu.org > https://lists.gnu.org/mailman/listinfo/grub-devel
I don't see anything wrong with the current handling of GRUB_HIDDEN_TIMEOUT and GRUB_TIMEOUT in grub-mkconfig other than it contradicting the documentation. I would rather fix the documentation and avoid any possible issues with grub's behavior changing for existing configurations with regard to these variables upon upgrading to grub 2.00. Below is a patch which fixes the documentation in grub.texi. -- Jordan Uggla (Jordan_U on irc.freenode.net) === modified file 'ChangeLog' --- ChangeLog 2012-05-15 15:17:06 +0000 +++ ChangeLog 2012-05-18 01:07:20 +0000 @@ -1,3 +1,10 @@ +2012-05-17 Jordan Uggla <jordan.ug...@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-15 Vladimir Serbinenko <phco...@gmail.com> * grub-core/fs/ntfs.c (read_data): Prevent overflow. === modified file 'docs/grub.texi' --- docs/grub.texi 2012-05-03 22:28:53 +0000 +++ docs/grub.texi 2012-05-18 00:49:41 +0000 @@ -1135,7 +1135,11 @@ @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, 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 In conjunction with @samp{GRUB_HIDDEN_TIMEOUT}, set this to @samp{true} to _______________________________________________ Grub-devel mailing list Grub-devel@gnu.org https://lists.gnu.org/mailman/listinfo/grub-devel