proxmox-mirrors/grub2
1
0
Fork 0
mirror of https://git.proxmox.com/git/grub2 synced 2025-07-27 10:08:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove stray "fi" in quick_boot.patch.

Browse Source
This commit is contained in:
Colin Watson 2013-12-09 00:20:17 +00:00
parent afe1d93f71
commit aac9cb5a90
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/patches/quick_boot.patch vendored
View File

@ -14,7 +14,7 @@ Description: Add configure option to bypass boot menu if possible
Author: Colin Watson <cjwatson@ubuntu.com> Author: Colin Watson <cjwatson@ubuntu.com>
Author: Richard Laager <rlaager@wiktel.com> Author: Richard Laager <rlaager@wiktel.com>
Forwarded: no Forwarded: no
Last-Update: 2013-12-08 Last-Update: 2013-12-09
Index: b/configure.ac Index: b/configure.ac
=================================================================== ===================================================================
@ -160,20 +160,19 @@ Index: b/util/grub.d/00_header.in
function load_video { function load_video {
EOF EOF
if [ -n "${GRUB_VIDEO_BACKEND}" ]; then if [ -n "${GRUB_VIDEO_BACKEND}" ]; then
@@ -282,6 +309,12 @@ @@ -282,6 +309,11 @@
make_timeout () make_timeout ()
{ {
+ cat << EOF + cat << EOF
+if [ "\${recordfail}" = 1 ] ; then +if [ "\${recordfail}" = 1 ] ; then
+ set timeout=${GRUB_RECORDFAIL_TIMEOUT:--1} + set timeout=${GRUB_RECORDFAIL_TIMEOUT:--1}
+fi
+else +else
+EOF +EOF
if [ "x${1}${3}" != "x" ] ; then if [ "x${1}${3}" != "x" ] ; then
if [ "x${3}" != "x" ] ; then if [ "x${3}" != "x" ] ; then
timeout="${2}" timeout="${2}"
@@ -304,26 +337,29 @@ @@ -304,26 +336,29 @@
verbose= verbose=
fi fi
cat << EOF cat << EOF

1
util/grub.d/00_header.in
View File

@ -312,7 +312,6 @@ make_timeout ()
cat << EOF cat << EOF
if [ "\${recordfail}" = 1 ] ; then if [ "\${recordfail}" = 1 ] ; then
set timeout=${GRUB_RECORDFAIL_TIMEOUT:--1} set timeout=${GRUB_RECORDFAIL_TIMEOUT:--1}
fi
else else
EOF EOF
if [ "x${1}${3}" != "x" ] ; then if [ "x${1}${3}" != "x" ] ; then