Consistently ignore GRUB_TIMEOUT if GRUB_HIDDEN_TIMEOUT is set

Pointed out by Vladimir Serbinenko.
This commit is contained in:
Colin Watson 2013-11-29 15:30:44 +00:00
parent 2dbda2215c
commit 095588ef34

View 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