From e0ca063a6625c5ea1c7fecf874022753bd989c62 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 4 May 2012 00:41:57 +0200
Subject: [PATCH] 	* util/grub.d/00_header.in: Make timeout apply to else
 	clause of hidden timout. 	Reported by: Mads Kiilerich.

---
 ChangeLog                | 6 ++++++
 util/grub.d/00_header.in | 2 ++
 2 files changed, 8 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index d654fd7f6..92b7c867a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-04  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/grub.d/00_header.in: Make timeout apply to else
+	clause of hidden timout.
+	Reported by: Mads Kiilerich.
+
 2012-05-04  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/kern/fs.c (grub_fs_probe) [GRUB_UTIL]: Add workaround for
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index 765bfdcd3..04db1c83f 100644
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -280,6 +280,8 @@ make_timeout ()
 	fi
 	cat << EOF
 if sleep$verbose --interruptible ${1} ; then
+  set timeout=0
+else
   set timeout=${2}
 fi
 EOF