vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* util/grub.d/00_header.in: Make timeout apply to else

Browse source 
clause of hidden timout.
	Reported by: Mads Kiilerich.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-05-04 00:41:57 +02:00
parent 076aeb5022
commit e0ca063a66
2 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -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> 2012-05-04 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/kern/fs.c (grub_fs_probe) [GRUB_UTIL]: Add workaround for * grub-core/kern/fs.c (grub_fs_probe) [GRUB_UTIL]: Add workaround for

2
util/grub.d/00_header.in
View file

@ -280,6 +280,8 @@ make_timeout ()
fi fi
cat << EOF cat << EOF
if sleep$verbose --interruptible ${1} ; then if sleep$verbose --interruptible ${1} ; then
set timeout=0
else
set timeout=${2} set timeout=${2}
fi fi
EOF EOF