Consistently ignore GRUB_TIMEOUT if GRUB_HIDDEN_TIMEOUT is set
authorColin Watson <cjwatson@ubuntu.com>
Fri, 29 Nov 2013 15:30:44 +0000 (15:30 +0000)
committerColin Watson <cjwatson@ubuntu.com>
Fri, 29 Nov 2013 15:30:44 +0000 (15:30 +0000)
Pointed out by Vladimir Serbinenko.

util/grub.d/00_header.in

index 6e8eb84..84d0499 100644 (file)
@@ -321,7 +321,7 @@ if [ x\$feature_timeout_style = xy ] ; then
   set timeout_style=$style
   set timeout=${1}
 elif sleep$verbose --interruptible ${1} ; then
-  set timeout=${2}
+  set timeout=0
 fi
 EOF
     else