2009-08-13 Colin Watson <cjwatson@ubuntu.com>

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

diff --git a/ChangeLog b/ChangeLog
index 4aeacf68a39034c15fee3652e747868922e1f546..ab51146e8ad44c89ea9dcd939458b9f7294bb030 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-08-13  Colin Watson  <cjwatson@ubuntu.com>
+
+       * 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  <blusseau@zetam.org>
 
        * include/grub/symbol.h: Add the LOCAL macro.

diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index f20c9de6939e0373636b343c690fa4c5f956d170..5865b89cedf331d8567894852fdcbb976da15921 100644 (file)
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -190,10 +190,28 @@ esac
 
 # 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

diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index a273213f3be97455891682262d49b05b0dc54296..98c7c004be550fc4ba7af7e860ab8c74881fd996 100644 (file)
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -37,7 +37,6 @@ if [ "x${GRUB_GFXMODE}" = "x" ] ; then GRUB_GFXMODE=640x480 ; fi
 
 cat << EOF
 set default=${GRUB_DEFAULT}
-set timeout=${GRUB_TIMEOUT}
 EOF
 
 case ${GRUB_TERMINAL_INPUT}:${GRUB_TERMINAL_OUTPUT} in
@@ -112,3 +111,20 @@ fi
 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