Revert last commit based on lack of consensus and possible unsmooth migration path

diff --git a/ChangeLog b/ChangeLog
index 92b7c867aeb90311f05386fca581a0768bf3005c..d654fd7f653717f53d69599e810dfedbf59bc42b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,3 @@
-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 04db1c83f626ce99ef949ccde6c89c9e4fb042f1..765bfdcd30e30c2d038dc37d97d3ddc7c573d950 100644 (file)
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -280,8 +280,6 @@ make_timeout ()
        fi
        cat << EOF
 if sleep$verbose --interruptible ${1} ; then
-  set timeout=0
-else
   set timeout=${2}
 fi
 EOF