From aac9cb5a907fca0dcc9f263292d9fb05cfe40cf4 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 9 Dec 2013 00:20:17 +0000 Subject: [PATCH] Remove stray "fi" in quick_boot.patch. --- debian/patches/quick_boot.patch | 7 +++---- util/grub.d/00_header.in | 1 - 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/debian/patches/quick_boot.patch b/debian/patches/quick_boot.patch index dd84f938f..053c53b13 100644 --- a/debian/patches/quick_boot.patch +++ b/debian/patches/quick_boot.patch @@ -14,7 +14,7 @@ Description: Add configure option to bypass boot menu if possible Author: Colin Watson Author: Richard Laager Forwarded: no -Last-Update: 2013-12-08 +Last-Update: 2013-12-09 Index: b/configure.ac =================================================================== @@ -160,20 +160,19 @@ Index: b/util/grub.d/00_header.in function load_video { EOF if [ -n "${GRUB_VIDEO_BACKEND}" ]; then -@@ -282,6 +309,12 @@ +@@ -282,6 +309,11 @@ make_timeout () { + cat << EOF +if [ "\${recordfail}" = 1 ] ; then + set timeout=${GRUB_RECORDFAIL_TIMEOUT:--1} -+fi +else +EOF if [ "x${1}${3}" != "x" ] ; then if [ "x${3}" != "x" ] ; then timeout="${2}" -@@ -304,26 +337,29 @@ +@@ -304,26 +336,29 @@ verbose= fi cat << EOF diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in index 7b1555b80..c748b096a 100644 --- a/util/grub.d/00_header.in +++ b/util/grub.d/00_header.in @@ -312,7 +312,6 @@ make_timeout () cat << EOF if [ "\${recordfail}" = 1 ] ; then set timeout=${GRUB_RECORDFAIL_TIMEOUT:--1} -fi else EOF if [ "x${1}${3}" != "x" ] ; then