Skip to contentSkip to conversation

Boot immediately after GRUB_HIDDEN_TIMEOUT

PATCH In review Mads Kiilerich 2 participants 2 messages Apr 29, 2012 – May 18, 2012

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Boot immediately after GRUB_HIDDEN_TIMEOUT

* util/grub.d/00_header.in: Boot immediately after GRUB_HIDDEN_TIMEOUT. Documentation said: "If no key is pressed during that time, boot immediately."

=== modified file 'ChangeLog'

ChangeLog +6 -0
@@ -1,3 +1,9 @@
+2012-04-29  Mads Kiilerich  <[email protected]>
+
+	* util/grub.d/00_header.in: Boot immediately after
+	GRUB_HIDDEN_TIMEOUT. Documentation said: "If no key is pressed
+	during that time, boot immediately."
+
 2012-04-29  Bean  <[email protected]>
 
 	* grub-core/net/drivers/efi/efinet.c (get_card_packet): Fix buffer

=== modified file 'util/grub.d/00_header.in'

grub.d/00_header.in +1 -1
@@ -280,7 +280,7 @@
 	fi
 	cat << EOF
 if sleep$verbose --interruptible ${1} ; then
-  set timeout=${2}
+  set timeout=0
 fi
 EOF
     else
#1 lore raw
Quoted 10 lines · Mads Kiilerich

* 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
[email protected]
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.

Signature · 33 lines
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  <[email protected]>
+
+       * 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  <[email protected]>
 
        * 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