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

* util/grub.d/00_header.in: Improve compatibility with old config.

Browse source
This commit is contained in:
Andrey Borzenkov 2013-12-24 17:26:05 +01:00 committed by Vladimir Serbinenko
parent 4127206896
commit 569766e49b
2 changed files with 34 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2013-12-24 Andrey Borzenkov <arvidjaar@gmail.com>
* util/grub.d/00_header.in: Improve compatibility with old config.
2013-12-24 Vladimir Serbinenko <phcoder@gmail.com> 2013-12-24 Vladimir Serbinenko <phcoder@gmail.com>
Make rijndael.c respect aliasing rules. Make rijndael.c respect aliasing rules.

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

@ -282,48 +282,50 @@ fi
make_timeout () make_timeout ()
{ {
if [ "x${1}${3}" != "x" ] ; then if [ "x${3}" != "x" ] ; then
if [ "x${3}" != "x" ] ; then timeout="${2}"
timeout="${2}" style="${3}"
style="${3}" elif [ "x${1}" != "x" -a "x${1}" != "x0" ] ; then
else # Handle the deprecated GRUB_HIDDEN_TIMEOUT scheme.
# Handle the deprecated GRUB_HIDDEN_TIMEOUT scheme. timeout="${1}"
timeout="${1}" if [ "x${2}" != "x0" ] ; then
if [ "x${2}" != "x0" ] ; then grub_warn "$(gettext "Setting GRUB_TIMEOUT to a non-zero value when GRUB_HIDDEN_TIMEOUT is set is no longer supported.")"
grub_warn "$(gettext "Setting GRUB_TIMEOUT to a non-zero value when GRUB_HIDDEN_TIMEOUT is set is no longer supported.")"
fi
if [ "x${GRUB_HIDDEN_TIMEOUT_QUIET}" = "xtrue" ] ; then
style="hidden"
else
style="countdown"
fi
fi fi
if [ "x${style}" = "xcountdown" ] ; then if [ "x${GRUB_HIDDEN_TIMEOUT_QUIET}" = "xtrue" ] ; then
verbose=" --verbose" style="hidden"
else
verbose= verbose=
else
style="countdown"
verbose=" --verbose"
fi fi
cat << EOF else
# No hidden timeout, so treat as GRUB_TIMEOUT_STYLE=menu
timeout="${2}"
style="menu"
fi
cat << EOF
if [ x\$feature_timeout_style = xy ] ; then if [ x\$feature_timeout_style = xy ] ; then
set timeout_style=${style} set timeout_style=${style}
set timeout=${timeout} set timeout=${timeout}
EOF EOF
if [ "x${style}" != "xmenu" ] ; then if [ "x${style}" = "xmenu" ] ; then
cat << EOF cat << EOF
# Fallback normal timeout code in case the timeout_style feature is
# unavailable.
else
set timeout=${timeout}
EOF
else
cat << EOF
# Fallback hidden-timeout code in case the timeout_style feature is # Fallback hidden-timeout code in case the timeout_style feature is
# unavailable. # unavailable.
elif sleep${verbose} --interruptible ${timeout} ; then elif sleep${verbose} --interruptible ${timeout} ; then
set timeout=0 set timeout=0
EOF EOF
fi fi
cat << EOF cat << EOF
fi fi
EOF EOF
else
cat << EOF
set timeout=${2}
EOF
fi
} }
if [ "x$GRUB_BUTTON_CMOS_ADDRESS" != "x" ]; then if [ "x$GRUB_BUTTON_CMOS_ADDRESS" != "x" ]; then