Change the default GRUB_RECORDFAIL_TIMEOUT to 30, so interactive users still get the opporunity to intervene after a real boot failure, but headless users will not end up stuck after boot failures that were really power failures (closes: #782552, LP: #1443735).

43 files changed, 76 insertions, 59 deletions

diff --git a/debian/.git-dpm b/debian/.git-dpm
index 897addb..90a5489 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-2d8a8f7b02769f532e0e515f21e7a19474079dc2
-2d8a8f7b02769f532e0e515f21e7a19474079dc2
+5354550fe1adb199564aed73077bc5e5c87ab998
+5354550fe1adb199564aed73077bc5e5c87ab998
 e8f07821cce1bd0ab6d5622c2a42440f15f4fd71
 e8f07821cce1bd0ab6d5622c2a42440f15f4fd71
 grub2_2.02~beta2.orig.tar.xz
diff --git a/debian/changelog b/debian/changelog
index 90a4111..d95a0fc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,12 @@ grub2 (2.02~beta2-23) UNRELEASED; urgency=medium
     - arp, icmp: Fix handling in case of oversized or invalid packets.
       (LP: #1428005)
 
+  [ Robie Basak ]
+  * Change the default GRUB_RECORDFAIL_TIMEOUT to 30, so interactive users
+    still get the opporunity to intervene after a real boot failure, but
+    headless users will not end up stuck after boot failures that were
+    really power failures (closes: #782552, LP: #1443735).
+
  -- Felix Zielcke <fzielcke@z-51.de>  Sat, 28 Mar 2015 12:17:08 +0100
 
 grub2 (2.02~beta2-22) unstable; urgency=medium
diff --git a/debian/patches/arp_icmp_oversize_handling.patch b/debian/patches/arp_icmp_oversize_handling.patch
index 8a1fee2..2c8f767 100644
--- a/debian/patches/arp_icmp_oversize_handling.patch
+++ b/debian/patches/arp_icmp_oversize_handling.patch
@@ -1,4 +1,4 @@
-From 2d8a8f7b02769f532e0e515f21e7a19474079dc2 Mon Sep 17 00:00:00 2001
+From 5354550fe1adb199564aed73077bc5e5c87ab998 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Fri, 20 Mar 2015 21:14:23 +0100
 Subject: arp, icmp: Fix handling in case of oversized or invalid packets.
diff --git a/debian/patches/btrfs-endian.patch b/debian/patches/btrfs-endian.patch
index 894bfef..9b761cd 100644
--- a/debian/patches/btrfs-endian.patch
+++ b/debian/patches/btrfs-endian.patch
@@ -1,4 +1,4 @@
-From affe0bced35b30b9246aa08e538203b423d0d9ab Mon Sep 17 00:00:00 2001
+From bffb3ddb9ad03f7fd5312e104b10dfe7f434354e Mon Sep 17 00:00:00 2001
 From: Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
 Date: Mon, 31 Mar 2014 15:32:30 +0100
 Subject: btrfs: fix get_root key comparison failures due to endianness
diff --git a/debian/patches/check_blocklists_overlap_fix.patch b/debian/patches/check_blocklists_overlap_fix.patch
index fe99ae2..33b9117 100644
--- a/debian/patches/check_blocklists_overlap_fix.patch
+++ b/debian/patches/check_blocklists_overlap_fix.patch
@@ -1,4 +1,4 @@
-From 2a54e1b19aa1e080f9795a00d7381c0be85b2a4b Mon Sep 17 00:00:00 2001
+From 256a8cb4aa118bc25f64d976453854ab85382556 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?=D0=A0=D0=BE=D0=BC=D0=B0=D0=BD=20=D0=9F=D0=B5=D1=85=D0=BE?=
  =?UTF-8?q?=D0=B2?= <roman_pekhov>
 Date: Sun, 22 Jun 2014 03:51:50 +0400
diff --git a/debian/patches/efi_sanitise_path.patch b/debian/patches/efi_sanitise_path.patch
index 92090fa..995f83a 100644
--- a/debian/patches/efi_sanitise_path.patch
+++ b/debian/patches/efi_sanitise_path.patch
@@ -1,4 +1,4 @@
-From 913e2ef0514e1b88d93f01b1e7bd1d1c944307b7 Mon Sep 17 00:00:00 2001
+From cf0dc36a7ea641ac9c168a8e283d29ba61dbd593 Mon Sep 17 00:00:00 2001
 From: Vladimir Serbinenko <phcoder@gmail.com>
 Date: Sat, 18 Jan 2014 16:41:47 +0100
 Subject: Fix UEFI boot failure with some firmware that returns incorrect paths
diff --git a/debian/patches/elf_bi_endian.patch b/debian/patches/elf_bi_endian.patch
index 0b0f598..f7b6086 100644
--- a/debian/patches/elf_bi_endian.patch
+++ b/debian/patches/elf_bi_endian.patch
@@ -1,4 +1,4 @@
-From a1d8b2fcc027d1e826fc137c34452b1f60bc39cd Mon Sep 17 00:00:00 2001
+From 553ebdcc8253d106bc999fb3a45236da009460f6 Mon Sep 17 00:00:00 2001
 From: Tomohiro B Berry <tbberry@us.ibm.com>
 Date: Tue, 14 Jan 2014 17:43:25 +0000
 Subject: Add bi-endian support to ELF parser
diff --git a/debian/patches/freebsd_debugflags_eperm.patch b/debian/patches/freebsd_debugflags_eperm.patch
index 0042665..82533f6 100644
--- a/debian/patches/freebsd_debugflags_eperm.patch
+++ b/debian/patches/freebsd_debugflags_eperm.patch
@@ -1,4 +1,4 @@
-From 07eab5c52b1160515d526a07d9f554bb9dbd4393 Mon Sep 17 00:00:00 2001
+From 5db8656dc64a00bd9b48ed671adde082789cb7d4 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@debian.org>
 Date: Fri, 17 Jan 2014 02:55:58 +0000
 Subject: Ignore EPERM when modifying kern.geom.debugflags
diff --git a/debian/patches/gettext-print-typo.patch b/debian/patches/gettext-print-typo.patch
index 9cfaf61..c14a187 100644
--- a/debian/patches/gettext-print-typo.patch
+++ b/debian/patches/gettext-print-typo.patch
@@ -1,4 +1,4 @@
-From 34411ff593136ce78ab5c21706dfb7ae3655a16f Mon Sep 17 00:00:00 2001
+From af91002a615fd05c4ce279844f93af90b7a6e53e Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Thu, 14 Aug 2014 21:02:31 +0400
 Subject: Fix typo (gettext_print instead of gettext_printf)
diff --git a/debian/patches/gfxpayload_dynamic.patch b/debian/patches/gfxpayload_dynamic.patch
index a1c6b96..e9ae383 100644
--- a/debian/patches/gfxpayload_dynamic.patch
+++ b/debian/patches/gfxpayload_dynamic.patch
@@ -1,4 +1,4 @@
-From 8b87b4c314cdb7c1d8753d2122db233ec2037da6 Mon Sep 17 00:00:00 2001
+From 2da6c5c585b96124c9d6e67f093f72ee92532f88 Mon Sep 17 00:00:00 2001
 From: Evan Broder <evan@ebroder.net>
 Date: Mon, 13 Jan 2014 12:13:29 +0000
 Subject: Add configure option to enable gfxpayload=keep dynamically
diff --git a/debian/patches/grub-install-extra-removable.patch b/debian/patches/grub-install-extra-removable.patch
index 6edc436..4e420ed 100644
--- a/debian/patches/grub-install-extra-removable.patch
+++ b/debian/patches/grub-install-extra-removable.patch
@@ -1,4 +1,4 @@
-From 0c98fa2f582d686e2e9ebdc7065b4475d38e57cb Mon Sep 17 00:00:00 2001
+From 1d50197a362bf2d2e4d34a7c6c684851a81d9e88 Mon Sep 17 00:00:00 2001
 From: Steve McIntyre <93sam@debian.org>
 Date: Wed, 3 Dec 2014 01:25:12 +0000
 Subject: Add support for forcing EFI installation to the removable media path
diff --git a/debian/patches/grub-install-pvxen-paths.patch b/debian/patches/grub-install-pvxen-paths.patch
index 3b245ac..59e2bda 100644
--- a/debian/patches/grub-install-pvxen-paths.patch
+++ b/debian/patches/grub-install-pvxen-paths.patch
@@ -1,4 +1,4 @@
-From 1f6d5327f7ae4d6b2cccb6a7c7bd19e86dffbc6e Mon Sep 17 00:00:00 2001
+From a1d6bec599caf6f35b9dbed2d135f2367fd1fcb5 Mon Sep 17 00:00:00 2001
 From: Ian Campbell <ijc@hellion.org.uk>
 Date: Sat, 6 Sep 2014 12:20:12 +0100
 Subject: grub-install: Install PV Xen binaries into the upstream specified
diff --git a/debian/patches/grub-shell-no-pad.patch b/debian/patches/grub-shell-no-pad.patch
index 77b5a8c..d330293 100644
--- a/debian/patches/grub-shell-no-pad.patch
+++ b/debian/patches/grub-shell-no-pad.patch
@@ -1,4 +1,4 @@
-From b2ca83bd23323cb4e22da47d5aa721d0d5665722 Mon Sep 17 00:00:00 2001
+From c4d85b34187f1af880a3be156431ac9c2c1b9226 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@debian.org>
 Date: Thu, 16 Jan 2014 12:51:23 +0000
 Subject: grub-shell: Pass -no-pad to xorriso when building floppy images
diff --git a/debian/patches/hostfs_remove_ftm.patch b/debian/patches/hostfs_remove_ftm.patch
index 6db5e24..2bc1f91 100644
--- a/debian/patches/hostfs_remove_ftm.patch
+++ b/debian/patches/hostfs_remove_ftm.patch
@@ -1,4 +1,4 @@
-From d6236220e351d7b712825997b7d84feb38e49bd3 Mon Sep 17 00:00:00 2001
+From 8a373ffb6cbd8236cc073605940f7019658dc149 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@debian.org>
 Date: Mon, 23 Mar 2015 14:34:01 +0000
 Subject: hostfs: Drop unnecessary feature test macros
diff --git a/debian/patches/ieee1275-clear-reset.patch b/debian/patches/ieee1275-clear-reset.patch
index 4c64247..91d23c3 100644
--- a/debian/patches/ieee1275-clear-reset.patch
+++ b/debian/patches/ieee1275-clear-reset.patch
@@ -1,4 +1,4 @@
-From 4a71b8b12eee0b8a04e6aebd910d5762a51cb4c6 Mon Sep 17 00:00:00 2001
+From 352496ff199aed4b58f17d4f15375a6b8fdc435a Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@linux.vnet.ibm.com>
 Date: Thu, 25 Sep 2014 18:41:29 -0300
 Subject: Include a text attribute reset in the clear command for ppc
diff --git a/debian/patches/ieee1275-pseries-emulation.patch b/debian/patches/ieee1275-pseries-emulation.patch
index b414f98..28c2b5c 100644
--- a/debian/patches/ieee1275-pseries-emulation.patch
+++ b/debian/patches/ieee1275-pseries-emulation.patch
@@ -1,4 +1,4 @@
-From 1d4954644ade521d8fe9d9ab1e9c1d505ca7cce1 Mon Sep 17 00:00:00 2001
+From 8135906c69a3206dfd147b3162abf67a6647cbb5 Mon Sep 17 00:00:00 2001
 From: Nikunj A Dadhania <nikunj@linux.vnet.ibm.com>
 Date: Thu, 20 Mar 2014 16:57:12 +0530
 Subject: ieee1275: check for IBM pseries emulated machine
diff --git a/debian/patches/ignore_grub_func_test_failures.patch b/debian/patches/ignore_grub_func_test_failures.patch
index 73490d0..3a5e2cd 100644
--- a/debian/patches/ignore_grub_func_test_failures.patch
+++ b/debian/patches/ignore_grub_func_test_failures.patch
@@ -1,4 +1,4 @@
-From 1d334cb51859e4a2393e8b6bd2829a1157bfbc9d Mon Sep 17 00:00:00 2001
+From 2397b81605e1d7a2ba7e010910cfc2bbf6c33f74 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@debian.org>
 Date: Mon, 13 Jan 2014 12:13:32 +0000
 Subject: Ignore functional test failures for now as they are broken
diff --git a/debian/patches/insmod-xzio-and-lzopio-on-xen.patch b/debian/patches/insmod-xzio-and-lzopio-on-xen.patch
index b23e49c..f692150 100644
--- a/debian/patches/insmod-xzio-and-lzopio-on-xen.patch
+++ b/debian/patches/insmod-xzio-and-lzopio-on-xen.patch
@@ -1,4 +1,4 @@
-From 117750671b90c8576dab576af524f29df9a0981c Mon Sep 17 00:00:00 2001
+From 0dbefbae6c1ae8195d2aebc6c4e839c79d1aec9a Mon Sep 17 00:00:00 2001
 From: Ian Campbell <ijc@debian.org>
 Date: Sun, 30 Nov 2014 12:12:52 +0000
 Subject: Arrange to insmod xzio and lzopio when booting a kernel as a Xen
diff --git a/debian/patches/install_arm64_naming.patch b/debian/patches/install_arm64_naming.patch
index 0334444..09041bf 100644
--- a/debian/patches/install_arm64_naming.patch
+++ b/debian/patches/install_arm64_naming.patch
@@ -1,4 +1,4 @@
-From a95c8e518330ec65e2878552d2f668774efaa51b Mon Sep 17 00:00:00 2001
+From bd491d4f83c8b1bf14d88196e543be7ab3f3ab18 Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Mon, 10 Mar 2014 13:34:10 +0000
 Subject: use {grub,boot}aa64.efi for boot images on AArch64
diff --git a/debian/patches/install_powerpc_machtypes.patch b/debian/patches/install_powerpc_machtypes.patch
index 0dfcfc6..deb2338 100644
--- a/debian/patches/install_powerpc_machtypes.patch
+++ b/debian/patches/install_powerpc_machtypes.patch
@@ -1,4 +1,4 @@
-From 4b3729540225e4c7e8dd68ab10a1dbb247026278 Mon Sep 17 00:00:00 2001
+From 109c99b2d9a38f4d17d28c43555a0755967afa4f Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@debian.org>
 Date: Tue, 28 Jan 2014 14:40:02 +0000
 Subject: Port yaboot logic for various powerpc machine types
diff --git a/debian/patches/macbless_mansection.patch b/debian/patches/macbless_mansection.patch
index 6a27a30..6add55e 100644
--- a/debian/patches/macbless_mansection.patch
+++ b/debian/patches/macbless_mansection.patch
@@ -1,4 +1,4 @@
-From 83e814cad0f5b0e95ce343fe55c4cceb875edaa5 Mon Sep 17 00:00:00 2001
+From 7bcdfb01a8b14cd2c556bfa1e8fe1d2124066b05 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Wed, 8 Jan 2014 11:05:20 +0000
 Subject: * Makefile.util.def (grub-macbless): Change mansection to 8.
diff --git a/debian/patches/mips-abiflags.patch b/debian/patches/mips-abiflags.patch
index 64709f0..1eaa7f8 100644
--- a/debian/patches/mips-abiflags.patch
+++ b/debian/patches/mips-abiflags.patch
@@ -1,4 +1,4 @@
-From f13b59663b779376e5dc3889179bbd0ca79585d2 Mon Sep 17 00:00:00 2001
+From 3ffb0e3aad19e7561e2199ccd29e6020a58b22d2 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@debian.org>
 Date: Fri, 26 Sep 2014 10:34:46 +0100
 Subject: Remove .MIPS.abiflags section from images
diff --git a/debian/patches/mixed_size_efi.patch b/debian/patches/mixed_size_efi.patch
index c78346a..344dcec7 100644
--- a/debian/patches/mixed_size_efi.patch
+++ b/debian/patches/mixed_size_efi.patch
@@ -1,4 +1,4 @@
-From 9d4f1601e187894da565f4573b5d174dcf586cd6 Mon Sep 17 00:00:00 2001
+From fa19a4f859910867f12662abbe1dc3ffc57c0f0a Mon Sep 17 00:00:00 2001
 From: Steve McIntyre <93sam@debian.org>
 Date: Tue, 27 Jan 2015 20:08:53 +0000
 Subject: Add support for running a 64-bit Linux kernel on a 32-bit EFI
diff --git a/debian/patches/mkconfig-kernels-infloop.patch b/debian/patches/mkconfig-kernels-infloop.patch
index 8e8b320..325e6c2 100644
--- a/debian/patches/mkconfig-kernels-infloop.patch
+++ b/debian/patches/mkconfig-kernels-infloop.patch
@@ -1,4 +1,4 @@
-From c278190ee403f581fbe485106f4c8683de913958 Mon Sep 17 00:00:00 2001
+From 67889529304f5c1bb355136d47da47ccbdf4e958 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Tue, 8 Jul 2014 23:54:30 +0100
 Subject: Fix an infinite loop in grub-mkconfig
diff --git a/debian/patches/mkconfig_other_inits.patch b/debian/patches/mkconfig_other_inits.patch
index 85c29fd..e3cd732 100644
--- a/debian/patches/mkconfig_other_inits.patch
+++ b/debian/patches/mkconfig_other_inits.patch
@@ -1,4 +1,4 @@
-From 810bd3508823c23b4fe05a4edcaf822932a9fffb Mon Sep 17 00:00:00 2001
+From 3cde0f2efbb8ff33cf2cb70fd3dc9c6c2c4b6359 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@debian.org>
 Date: Sat, 3 Jan 2015 12:04:59 +0000
 Subject: Generate alternative init entries in advanced menu
diff --git a/debian/patches/mkconfig_recovery_title.patch b/debian/patches/mkconfig_recovery_title.patch
index 96630f8..119ffb5 100644
--- a/debian/patches/mkconfig_recovery_title.patch
+++ b/debian/patches/mkconfig_recovery_title.patch
@@ -1,4 +1,4 @@
-From aa6cd0ede64ab60a58c00f3d4ff04b0db15188e0 Mon Sep 17 00:00:00 2001
+From 61e102680ca8b0eed26fcf9fd97700c8ed97d5fc Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Mon, 13 Jan 2014 12:13:33 +0000
 Subject: Add GRUB_RECOVERY_TITLE option
@@ -21,10 +21,10 @@ Patch-Name: mkconfig_recovery_title.patch
  7 files changed, 17 insertions(+), 7 deletions(-)
 
 diff --git a/docs/grub.texi b/docs/grub.texi
-index 28743d5..af020ec 100644
+index a79256b..49b17ec 100644
 --- a/docs/grub.texi
 +++ b/docs/grub.texi
-@@ -1499,6 +1499,11 @@ restricted or limited.
+@@ -1504,6 +1504,11 @@ a console is restricted or limited.
  This option is only effective when GRUB was configured with the
  @option{--enable-quick-boot} option.
  
diff --git a/debian/patches/mkrescue_arm64_naming.patch b/debian/patches/mkrescue_arm64_naming.patch
index 22039fa..8f7f50e 100644
--- a/debian/patches/mkrescue_arm64_naming.patch
+++ b/debian/patches/mkrescue_arm64_naming.patch
@@ -1,4 +1,4 @@
-From d9c512e0e73104103c12b0421e75370f27f0913f Mon Sep 17 00:00:00 2001
+From f6e10daada6e7648f3a473717a6bf7414b1df493 Mon Sep 17 00:00:00 2001
 From: Andrey Borzenkov <arvidjaar@gmail.com>
 Date: Mon, 10 Mar 2014 13:35:53 +0000
 Subject: Change grub-mkrescue to use bootaa64.efi too
diff --git a/debian/patches/net-ramp-up-interval.patch b/debian/patches/net-ramp-up-interval.patch
index d888966..913f49f 100644
--- a/debian/patches/net-ramp-up-interval.patch
+++ b/debian/patches/net-ramp-up-interval.patch
@@ -1,4 +1,4 @@
-From 862630bb625d11c5c61e00dd859651b09909f79a Mon Sep 17 00:00:00 2001
+From 7a2d4713e4047faf7bfcf2ff868b87cacc6747f0 Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
 Date: Tue, 21 Jan 2014 11:03:51 -0200
 Subject: increase network try interval gradually
diff --git a/debian/patches/net-receive-packets-yield.patch b/debian/patches/net-receive-packets-yield.patch
index 501d31e..f21ebfc 100644
--- a/debian/patches/net-receive-packets-yield.patch
+++ b/debian/patches/net-receive-packets-yield.patch
@@ -1,4 +1,4 @@
-From 91b9c6591fb71ad7cb4e2c4ea374cb4074cff5b6 Mon Sep 17 00:00:00 2001
+From 207404778dcd59b29191f5800cf8fa10309a5027 Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@br.ibm.com>
 Date: Tue, 21 Jan 2014 10:49:39 -0200
 Subject: change stop condition to avoid infinite loops
diff --git a/debian/patches/platform-none.patch b/debian/patches/platform-none.patch
index 2a32c41..9bf1895 100644
--- a/debian/patches/platform-none.patch
+++ b/debian/patches/platform-none.patch
@@ -1,4 +1,4 @@
-From 663cae9e09a98125b1a822dead3e587e56163e30 Mon Sep 17 00:00:00 2001
+From c90efcccb8356158468126e72ae053ec414cef4e Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@debian.org>
 Date: Tue, 23 Sep 2014 12:11:58 +0100
 Subject: Add a new "none" platform that only builds utilities
diff --git a/debian/patches/ppc64el-disable-vsx.patch b/debian/patches/ppc64el-disable-vsx.patch
index 4af35b8..7959153 100644
--- a/debian/patches/ppc64el-disable-vsx.patch
+++ b/debian/patches/ppc64el-disable-vsx.patch
@@ -1,4 +1,4 @@
-From f7e1bb53e4ea20869766206e348ad97351f94bb2 Mon Sep 17 00:00:00 2001
+From 9a2257901939ae38c37d3f0b1b189ca3625fd47f Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@linux.vnet.ibm.com>
 Date: Thu, 25 Sep 2014 19:33:39 -0300
 Subject: Disable VSX instruction
diff --git a/debian/patches/ppc64el-flags.patch b/debian/patches/ppc64el-flags.patch
index bfa07f9..2d13a3d 100644
--- a/debian/patches/ppc64el-flags.patch
+++ b/debian/patches/ppc64el-flags.patch
@@ -1,4 +1,4 @@
-From a3d4a8e080676a39793194f934925f1631ee3a04 Mon Sep 17 00:00:00 2001
+From de93ef4181274e9788b26f105ca29d267003b8b8 Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@linux.vnet.ibm.com>
 Date: Wed, 17 Sep 2014 14:42:40 -0300
 Subject: Add powerpc little-endian (ppc64le) flags
diff --git a/debian/patches/ppc64el-skip-libgcc.patch b/debian/patches/ppc64el-skip-libgcc.patch
index 1e497bd..50e2bb3 100644
--- a/debian/patches/ppc64el-skip-libgcc.patch
+++ b/debian/patches/ppc64el-skip-libgcc.patch
@@ -1,4 +1,4 @@
-From 84bf326fe956748e429f618c84e4fb9410357e1f Mon Sep 17 00:00:00 2001
+From 08bc658b8301b525aaefac626d02ff083ffb1aa0 Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <pfsmorigo@linux.vnet.ibm.com>
 Date: Wed, 17 Sep 2014 14:44:30 -0300
 Subject: Skip libgcc dependency for powerpc
diff --git a/debian/patches/probe-delimiter.patch b/debian/patches/probe-delimiter.patch
index f1a9d1d..bc94f62 100644
--- a/debian/patches/probe-delimiter.patch
+++ b/debian/patches/probe-delimiter.patch
@@ -1,4 +1,4 @@
-From 1bed8e4e5843fecef7f2252a98742fc7b2e8d7e4 Mon Sep 17 00:00:00 2001
+From bcc5252f0c9357f78a36459b77436aee8a0fe804 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Mon, 31 Mar 2014 14:48:33 +0100
 Subject: Fix partmap, cryptodisk, and abstraction handling in grub-mkconfig.
diff --git a/debian/patches/probe_fusionio.patch b/debian/patches/probe_fusionio.patch
index f60004a..ec30b1b 100644
--- a/debian/patches/probe_fusionio.patch
+++ b/debian/patches/probe_fusionio.patch
@@ -1,4 +1,4 @@
-From 4112665e5964579aa723c19b3a316a74b7137c08 Mon Sep 17 00:00:00 2001
+From cf9de5a21539892566a1f159d7b15670640d01ff Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Mon, 13 Jan 2014 12:13:31 +0000
 Subject: Probe FusionIO devices
diff --git a/debian/patches/probe_nvme.patch b/debian/patches/probe_nvme.patch
index 0412995..3802470 100644
--- a/debian/patches/probe_nvme.patch
+++ b/debian/patches/probe_nvme.patch
@@ -1,4 +1,4 @@
-From 653e57efb0d65833016a9c39df82eb1a6ddbd58c Mon Sep 17 00:00:00 2001
+From 2f4786b719e465a11f0317a045741177a38d66a6 Mon Sep 17 00:00:00 2001
 From: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
 Date: Tue, 29 Apr 2014 16:45:44 +0100
 Subject: Add support for nvme device in grub-mkdevicemap
diff --git a/debian/patches/quick_boot.patch b/debian/patches/quick_boot.patch
index eaca6f2..d663f28 100644
--- a/debian/patches/quick_boot.patch
+++ b/debian/patches/quick_boot.patch
@@ -1,4 +1,4 @@
-From 211894b6333be68c2ddaa2f3a8d9b0df7b13b60c Mon Sep 17 00:00:00 2001
+From a6c14d009f574b026c8aebb977cd1e808827961b Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Mon, 13 Jan 2014 12:13:28 +0000
 Subject: Add configure option to bypass boot menu if possible
@@ -17,19 +17,20 @@ If the previous boot failed (defined as failing to get to the end of one
 of the normal runlevels), then show the boot menu regardless.
 
 Author: Richard Laager <rlaager@wiktel.com>
+Author: Robie Basak <robie.basak@ubuntu.com>
 Forwarded: no
-Last-Update: 2014-01-17
+Last-Update: 2015-05-14
 
 Patch-Name: quick_boot.patch
 ---
  configure.ac                | 11 +++++++++
- docs/grub.texi              |  9 +++++++
+ docs/grub.texi              | 14 +++++++++++
  grub-core/normal/menu.c     | 24 +++++++++++++++++++
  util/grub-mkconfig.in       |  3 ++-
  util/grub.d/00_header.in    | 58 +++++++++++++++++++++++++++++++++++----------
  util/grub.d/10_linux.in     |  4 ++++
  util/grub.d/30_os-prober.in | 21 ++++++++++++++++
- 7 files changed, 117 insertions(+), 13 deletions(-)
+ 7 files changed, 122 insertions(+), 13 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
 index 7c8d0af..2a7e410 100644
@@ -54,18 +55,23 @@ index 7c8d0af..2a7e410 100644
  
  AC_SUBST([FONT_SOURCE])
 diff --git a/docs/grub.texi b/docs/grub.texi
-index 46b9e7f..28743d5 100644
+index 46b9e7f..a79256b 100644
 --- a/docs/grub.texi
 +++ b/docs/grub.texi
-@@ -1490,6 +1490,15 @@ This option may be set to a list of GRUB module names separated by spaces.
+@@ -1490,6 +1490,20 @@ This option may be set to a list of GRUB module names separated by spaces.
  Each module will be loaded as early as possible, at the start of
  @file{grub.cfg}.
  
 +@item GRUB_RECORDFAIL_TIMEOUT
-+If this option is set, it overrides the default recordfail setting. The
-+default setting is -1, which causes GRUB to wait for user input. This option
-+should be set on headless and appliance systems where access to a console is
-+restricted or limited.
++If this option is set, it overrides the default recordfail setting.  A
++setting of -1 causes GRUB to wait for user input indefinitely.  However, a
++false positive in the recordfail mechanism may occur if power is lost during
++boot before boot success is recorded in userspace.  The default setting is
++30, which causes GRUB to wait for user input for thirty seconds before
++continuing.  This default allows interactive users the opportunity to switch
++to a different, working kernel, while avoiding a false positive causing the
++boot to block indefinitely on headless and appliance systems where access to
++a console is restricted or limited.
 +
 +This option is only effective when GRUB was configured with the
 +@option{--enable-quick-boot} option.
@@ -123,7 +129,7 @@ index 62780bf..17350d4 100644
  if test "x${grub_cfg}" != "x"; then
    rm -f "${grub_cfg}.new"
 diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
-index 0c82f23..8dc5592 100644
+index 0c82f23..2e6b5a4 100644
 --- a/util/grub.d/00_header.in
 +++ b/util/grub.d/00_header.in
 @@ -21,6 +21,8 @@ prefix="@prefix@"
@@ -181,7 +187,7 @@ index 0c82f23..8dc5592 100644
  {
 +    cat << EOF
 +if [ "\${recordfail}" = 1 ] ; then
-+  set timeout=${GRUB_RECORDFAIL_TIMEOUT:--1}
++  set timeout=${GRUB_RECORDFAIL_TIMEOUT:-30}
 +else
 +EOF
      if [ "x${3}" != "x" ] ; then
diff --git a/debian/patches/skip_gettext_strings_test.patch b/debian/patches/skip_gettext_strings_test.patch
index 33fe30c..697323e 100644
--- a/debian/patches/skip_gettext_strings_test.patch
+++ b/debian/patches/skip_gettext_strings_test.patch
@@ -1,4 +1,4 @@
-From d95a627cb8803ef2385af3a0257470430029e74b Mon Sep 17 00:00:00 2001
+From ba258ff9134fe4f3c5c18452243165fa0461eacc Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Mon, 13 Jan 2014 12:13:34 +0000
 Subject: Don't run gettext_strings_test
diff --git a/debian/patches/tolerate-lvm-snapshots.patch b/debian/patches/tolerate-lvm-snapshots.patch
index 37fbeb3..893032d 100644
--- a/debian/patches/tolerate-lvm-snapshots.patch
+++ b/debian/patches/tolerate-lvm-snapshots.patch
@@ -1,4 +1,4 @@
-From 2cbc65eff2de3b02bf653df089a049d555ef06a3 Mon Sep 17 00:00:00 2001
+From 466aa905d54de2d12a137d0776b311061e8fa6b0 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Thu, 10 Apr 2014 16:54:33 +0100
 Subject: Tolerate devices with no filesystem UUID returned by os-prober
diff --git a/debian/patches/vt_handoff.patch b/debian/patches/vt_handoff.patch
index 6bd3809..96439e7 100644
--- a/debian/patches/vt_handoff.patch
+++ b/debian/patches/vt_handoff.patch
@@ -1,4 +1,4 @@
-From 253d942fd0bb4d2f07619369b65db006792d9df7 Mon Sep 17 00:00:00 2001
+From faa0479b7699187014f4130164abd3a18a83cba6 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@ubuntu.com>
 Date: Mon, 13 Jan 2014 12:13:30 +0000
 Subject: Add configure option to use vt.handoff=7
diff --git a/debian/patches/x32.patch b/debian/patches/x32.patch
index 9a10d42..594c666 100644
--- a/debian/patches/x32.patch
+++ b/debian/patches/x32.patch
@@ -1,4 +1,4 @@
-From beef9dbb0659407889eaa48f9ac73a152a1046f0 Mon Sep 17 00:00:00 2001
+From 9fdf109007d30fcd9d684689b30207039363c7b9 Mon Sep 17 00:00:00 2001
 From: Colin Watson <cjwatson@debian.org>
 Date: Sun, 7 Sep 2014 23:06:49 +0100
 Subject: Support grub-emu on x32 (ILP32 but with x86-64 instruction set)
diff --git a/docs/grub.texi b/docs/grub.texi
index af020ec..49b17ec 100644
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -1491,10 +1491,15 @@ Each module will be loaded as early as possible, at the start of
 @file{grub.cfg}.
 
 @item GRUB_RECORDFAIL_TIMEOUT
-If this option is set, it overrides the default recordfail setting. The
-default setting is -1, which causes GRUB to wait for user input. This option
-should be set on headless and appliance systems where access to a console is
-restricted or limited.
+If this option is set, it overrides the default recordfail setting.  A
+setting of -1 causes GRUB to wait for user input indefinitely.  However, a
+false positive in the recordfail mechanism may occur if power is lost during
+boot before boot success is recorded in userspace.  The default setting is
+30, which causes GRUB to wait for user input for thirty seconds before
+continuing.  This default allows interactive users the opportunity to switch
+to a different, working kernel, while avoiding a false positive causing the
+boot to block indefinitely on headless and appliance systems where access to
+a console is restricted or limited.
 
 This option is only effective when GRUB was configured with the
 @option{--enable-quick-boot} option.
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index 8dc5592..2e6b5a4 100644
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -311,7 +311,7 @@ make_timeout ()
 {
     cat << EOF
 if [ "\${recordfail}" = 1 ] ; then
-  set timeout=${GRUB_RECORDFAIL_TIMEOUT:--1}
+  set timeout=${GRUB_RECORDFAIL_TIMEOUT:-30}
 else
 EOF
     if [ "x${3}" != "x" ] ; then