[2492] 2009-08-13 Colin Watson <address@hidden>

[Robert Millan]

Revision: 2492
          http://svn.sv.gnu.org/viewvc/?view=rev&root=grub&revision=2492
Author:   robertmh
Date:     2009-08-13 20:08:23 +0000 (Thu, 13 Aug 2009)
Log Message:
-----------
2009-08-13  Colin Watson  <address@hidden>

        * util/grub-mkconfig.in: Export GRUB_HIDDEN_TIMEOUT.
        * util/grub.d/00_header.in: Enter interruptible sleep if
        GRUB_HIDDEN_TIMEOUT is set.

Modified Paths:
--------------
    trunk/grub2/ChangeLog
    trunk/grub2/util/grub-mkconfig.in
    trunk/grub2/util/grub.d/00_header.in

Modified: trunk/grub2/ChangeLog
===================================================================
--- trunk/grub2/ChangeLog       2009-08-13 06:09:39 UTC (rev 2491)
+++ trunk/grub2/ChangeLog       2009-08-13 20:08:23 UTC (rev 2492)
@@ -1,3 +1,9 @@
+2009-08-13  Colin Watson  <address@hidden>
+
+       * util/grub-mkconfig.in: Export GRUB_HIDDEN_TIMEOUT.
+       * util/grub.d/00_header.in: Enter interruptible sleep if
+       GRUB_HIDDEN_TIMEOUT is set.
+
 2009-08-13  Yves Blusseau  <address@hidden>
 
        * include/grub/symbol.h: Add the LOCAL macro.

Modified: trunk/grub2/util/grub-mkconfig.in
===================================================================
--- trunk/grub2/util/grub-mkconfig.in   2009-08-13 06:09:39 UTC (rev 2491)
+++ trunk/grub2/util/grub-mkconfig.in   2009-08-13 20:08:23 UTC (rev 2492)
@@ -190,10 +190,28 @@
 
 # These are defined in this script, export them here so that user can
 # override them.
-export GRUB_DEVICE GRUB_DEVICE_UUID GRUB_DEVICE_BOOT GRUB_DEVICE_BOOT_UUID 
GRUB_FS GRUB_FONT_PATH GRUB_PRELOAD_MODULES
+export GRUB_DEVICE \
+  GRUB_DEVICE_UUID \
+  GRUB_DEVICE_BOOT \
+  GRUB_DEVICE_BOOT_UUID \
+  GRUB_FS \
+  GRUB_FONT_PATH \
+  GRUB_PRELOAD_MODULES
 
 # These are optional, user-defined variables.
-export GRUB_DEFAULT GRUB_TIMEOUT GRUB_DISTRIBUTOR GRUB_CMDLINE_LINUX 
GRUB_CMDLINE_LINUX_DEFAULT GRUB_TERMINAL_INPUT GRUB_TERMINAL_OUTPUT 
GRUB_SERIAL_COMMAND GRUB_DISABLE_LINUX_UUID GRUB_DISABLE_LINUX_RECOVERY 
GRUB_GFXMODE
+export GRUB_DEFAULT \
+  GRUB_HIDDEN_TIMEOUT \
+  GRUB_HIDDEN_TIMEOUT_QUIET \
+  GRUB_TIMEOUT \
+  GRUB_DISTRIBUTOR \
+  GRUB_CMDLINE_LINUX \
+  GRUB_CMDLINE_LINUX_DEFAULT \
+  GRUB_TERMINAL_INPUT \
+  GRUB_TERMINAL_OUTPUT \
+  GRUB_SERIAL_COMMAND \
+  GRUB_DISABLE_LINUX_UUID \
+  GRUB_DISABLE_LINUX_RECOVERY \
+  GRUB_GFXMODE
 
 if test "x${grub_cfg}" != "x"; then
   rm -f ${grub_cfg}.new

Modified: trunk/grub2/util/grub.d/00_header.in
===================================================================
--- trunk/grub2/util/grub.d/00_header.in        2009-08-13 06:09:39 UTC (rev 
2491)
+++ trunk/grub2/util/grub.d/00_header.in        2009-08-13 20:08:23 UTC (rev 
2492)
@@ -37,7 +37,6 @@
 
 cat << EOF
 set default=${GRUB_DEFAULT}
-set timeout=${GRUB_TIMEOUT}
 EOF
 
 case ${GRUB_TERMINAL_INPUT}:${GRUB_TERMINAL_OUTPUT} in
@@ -112,3 +111,20 @@
 EOF
   ;;
 esac
+
+if [ "x${GRUB_HIDDEN_TIMEOUT}" != "x" ] ; then
+  if [ "x${GRUB_HIDDEN_TIMEOUT_QUIET}" = "xtrue" ] ; then 
+    verbose=
+  else
+    verbose=" --verbose"
+  fi
+  cat << EOF
+if sleep$verbose --interruptible ${GRUB_HIDDEN_TIMEOUT} ; then
+  set timeout=${GRUB_TIMEOUT}
+fi
+EOF
+else
+  cat << EOF
+set timeout=${GRUB_TIMEOUT}
+EOF
+fi