Merge ~juliank/grub/+git/ubuntu:ubuntu into ~ubuntu-core-dev/grub/+git/ubuntu:ubuntu

[Julian Andres Klode]

[Julian Andres Klode (juliank)]

I force resetted the ubuntu branch to focal, and this contains a rebase of the previous ubuntu changes on top of that branch.

[Julian Andres Klode (juliank)]

I checked diff ubuntu26..oldubuntu28 > a.diff, diff ubuntu26.2...HEAD > b.diff, then ran filterdiff to exclude debian/patches changes (as we are patches applied), and then ran icdiff a.diff b.diff to confirm there were no other unexpected changes

[Julian Andres Klode (juliank)]

I pushed the original branch as

debian/unreleased-2.04-1ubuntu29

So you can compare

$ git diff debian/2.04-1ubuntu26...debian/unreleased-2.04-1ubuntu29 | filterdiff -p1 -x 'debian/patches/*' > a.diff
$ git diff debian/2.04-1ubuntu26.2... | filterdiff -p1 -x 'debian/patches/*' > b.diff
$ icdiff a.diff b.diff | less -R

Which shows the only change missing is the gettext patch rename, which was in the security update.

diff --git a/debian/.git-dpm b/debian/.git-dpm
index 19c2663..ed27285 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-ec83738b990d5008c23fa820edbfd9580df95e51
-ec83738b990d5008c23fa820edbfd9580df95e51
+398371c71cd52b6c48fa1d888903bd8a85682ec0
+398371c71cd52b6c48fa1d888903bd8a85682ec0
 578bb115fbd47e1c464696f1f8d6183e5443975d
 578bb115fbd47e1c464696f1f8d6183e5443975d
 grub2_2.04.orig.tar.xz
diff --git a/debian/changelog b/debian/changelog
index aec9c0a..636ebab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+grub2 (2.04-1ubuntu27) UNRELEASED; urgency=medium
+
+  * debian/patches/ubuntu-flavour-order.patch:
+    - Add a (hidden) GRUB_FLAVOUR_ORDER setting that can mark certain kernel
+      flavours as preferred, and specify an order between those preferred
+      flavours (LP: #1882663)
+  * debian/patches/ubuntu-zfs-enhance-support.patch:
+    - Use version_find_latest for ordering kernels, so it also supports
+      the GRUB_FLAVOUR_ORDER setting.
+  * debian/patches/ubuntu-dont-verify-loopback-images.patch:
+    - disk/loopback: Don't verify loopback images (LP: #1878541),
+      Thanks to Chris Coulson for the patch
+  * debian/patches/ubuntu-recovery-dis_ucode_ldr.patch
+    - Pass dis_ucode_ldr to kernel for recovery mode (LP: #1831789)
+  * debian/patches/ubuntu-add-initrd-less-boot-fallback.patch:
+    - Merge changes from xnox to fix multiple initrds support (LP: #1878705)
+  * debian/patches/ubuntu-clear-invalid-initrd-spacing.patch:
+    - Remove, no longer needed thanks to xnox's patch
+
+ -- Julian Andres Klode <[e-mail]>  Thu, 06 Aug 2020 10:14:56 +0200
+
 grub2 (2.04-1ubuntu26.2) focal; urgency=medium
 
   * debian/postinst.in: Avoid calling grub-install on upgrade of the grub-pc
diff --git a/debian/patches/0075-uefi-firmware-rename-fwsetup-menuentry-to-UEFI-Firmw.patch b/debian/patches/0074-uefi-firmware-rename-fwsetup-menuentry-to-UEFI-Firmw.patch
 similarity index 90%
 rename from debian/patches/0075-uefi-firmware-rename-fwsetup-menuentry-to-UEFI-Firmw.patch
 rename to debian/patches/0074-uefi-firmware-rename-fwsetup-menuentry-to-UEFI-Firmw.patch
index 0bab37b..20dbfb4 100644
--- a/debian/patches/0075-uefi-firmware-rename-fwsetup-menuentry-to-UEFI-Firmw.patch
+++ b/debian/patches/0074-uefi-firmware-rename-fwsetup-menuentry-to-UEFI-Firmw.patch
@@ -1,4 +1,4 @@
-From 4d3c59dd378362f4e0e30aaaf77068bea97ebd24 Mon Sep 17 00:00:00 2001
+From 7bae32b384bf0129a980b77447e21abb4024f693 Mon Sep 17 00:00:00 2001
 From: Dimitri John Ledkov <[e-mail]>
 Date: Mon, 24 Feb 2020 20:29:53 +0000
 Subject: uefi-firmware: rename fwsetup menuentry to UEFI Firmware Settings
@@ -9,7 +9,7 @@ LP: #1864547
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/util/grub.d/30_uefi-firmware.in b/util/grub.d/30_uefi-firmware.in
-index 3c9f533d8..b072d219f 100644
+index 3c9f533d8c..b072d219f6 100644
 --- a/util/grub.d/30_uefi-firmware.in
 +++ b/util/grub.d/30_uefi-firmware.in
 @@ -32,9 +32,9 @@ OsIndications="$efi_vars_dir/OsIndicationsSupported-$EFI_GLOBAL_VARIABLE/data"
diff --git a/debian/patches/0076-smbios-Add-a-linux-argument-to-apply-linux-modalias-.patch b/debian/patches/0075-smbios-Add-a-linux-argument-to-apply-linux-modalias-.patch
 similarity index 97%
 rename from debian/patches/0076-smbios-Add-a-linux-argument-to-apply-linux-modalias-.patch
 rename to debian/patches/0075-smbios-Add-a-linux-argument-to-apply-linux-modalias-.patch
index c1bbac6..3f8f67c 100644
--- a/debian/patches/0076-smbios-Add-a-linux-argument-to-apply-linux-modalias-.patch
+++ b/debian/patches/0075-smbios-Add-a-linux-argument-to-apply-linux-modalias-.patch
@@ -1,4 +1,4 @@
-From b7ae50d78035e0e73f5ea212fab7b728353c988b Mon Sep 17 00:00:00 2001
+From 484c805e1361fd010e0c3e2c44585f5f7e3899c1 Mon Sep 17 00:00:00 2001
 From: Julian Andres Klode <[e-mail]>
 Date: Tue, 3 Mar 2020 16:06:34 +0100
 Subject: smbios: Add a --linux argument to apply linux modalias-like filtering
@@ -16,7 +16,7 @@ Origin: upstream, https://git.savannah.gnu.org/cgit/grub.git/commit/?id=87049f97
  1 file changed, 24 insertions(+)
 
 diff --git a/grub-core/commands/smbios.c b/grub-core/commands/smbios.c
-index 7a6a391fc..1a9086ddd 100644
+index 7a6a391fc1..1a9086ddd4 100644
 --- a/grub-core/commands/smbios.c
 +++ b/grub-core/commands/smbios.c
 @@ -64,6 +64,21 @@ grub_smbios_get_eps3 (void)
diff --git a/debian/patches/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch b/debian/patches/0076-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch
 similarity index 97%
 rename from debian/patches/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch
 rename to debian/patches/0076-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch
index 13e098e..8460c3c 100644
--- a/debian/patches/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch
+++ b/debian/patches/0076-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch
@@ -1,4 +1,4 @@
-From 3004e78bbfe6acb5e38290b2e5c7fff277ea1628 Mon Sep 17 00:00:00 2001
+From 80b0e6a9375628f209b96173ce0a3af70060131c Mon Sep 17 00:00:00 2001
 From: Chris Coulson <[e-mail]>
 Date: Wed, 11 Mar 2020 16:46:00 +0100
 Subject: ubuntu: Make the linux command in EFI grub always try EFI handover
@@ -18,7 +18,7 @@ only if secure boot is disabled.
  2 files changed, 35 insertions(+), 26 deletions(-)
 
 diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
-index 6b6aef87f..fe3ca2c59 100644
+index 6b6aef87f7..fe3ca2c596 100644
 --- a/grub-core/loader/i386/efi/linux.c
 +++ b/grub-core/loader/i386/efi/linux.c
 @@ -27,6 +27,7 @@
@@ -51,7 +51,7 @@ index 6b6aef87f..fe3ca2c59 100644
  
    params = grub_efi_allocate_pages_max (0x3fffffff,
 diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
-index 4328bcbdb..991eb29db 100644
+index 4328bcbdb0..991eb29db9 100644
 --- a/grub-core/loader/i386/linux.c
 +++ b/grub-core/loader/i386/linux.c
 @@ -658,35 +658,40 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
diff --git a/debian/patches/0078-ubuntu-Update-the-linux-boot-protocol-version-check.patch b/debian/patches/0077-ubuntu-Update-the-linux-boot-protocol-version-check.patch
 similarity index 91%
 rename from debian/patches/0078-ubuntu-Update-the-linux-boot-protocol-version-check.patch
 rename to debian/patches/0077-ubuntu-Update-the-linux-boot-protocol-version-check.patch
index 07e93a4..dfd3ee8 100644
--- a/debian/patches/0078-ubuntu-Update-the-linux-boot-protocol-version-check.patch
+++ b/debian/patches/0077-ubuntu-Update-the-linux-boot-protocol-version-check.patch
@@ -1,4 +1,4 @@
-From 05c83490bed811e5dd5cde7c59bb56cc2db751d6 Mon Sep 17 00:00:00 2001
+From f59fbf2d6ae70d8872d8b680cfccb6e139410944 Mon Sep 17 00:00:00 2001
 From: Chris Coulson <[e-mail]>
 Date: Wed, 11 Mar 2020 16:46:41 +0100
 Subject: ubuntu: Update the linux boot protocol version check.
@@ -11,7 +11,7 @@ check accordingly.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
-index fe3ca2c59..2929da7a2 100644
+index fe3ca2c596..2929da7a29 100644
 --- a/grub-core/loader/i386/efi/linux.c
 +++ b/grub-core/loader/i386/efi/linux.c
 @@ -245,7 +245,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
diff --git a/debian/patches/0082-yylex-Make-lexer-fatal-errors-actually-be-fatal.patch b/debian/patches/0081-yylex-Make-lexer-fatal-errors-actually-be-fatal.patch
 similarity index 96%
 rename from debian/patches/0082-yylex-Make-lexer-fatal-errors-actually-be-fatal.patch
 rename to debian/patches/0081-yylex-Make-lexer-fatal-errors-actually-be-fatal.patch
index 0c4122e..5ce30a2 100644
--- a/debian/patches/0082-yylex-Make-lexer-fatal-errors-actually-be-fatal.patch
+++ b/debian/patches/0081-yylex-Make-lexer-fatal-errors-actually-be-fatal.patch
@@ -1,4 +1,4 @@
-From 6d5cd112c65caf7c46518a79a27fe7930ec4714e Mon Sep 17 00:00:00 2001
+From e25ff4f02fae2c006408a8fa1283320cd81ff87d Mon Sep 17 00:00:00 2001
 From: Peter Jones <[e-mail]>
 Date: Wed, 15 Apr 2020 15:45:02 -0400
 Subject: yylex: Make lexer fatal errors actually be fatal
@@ -47,7 +47,7 @@ Reviewed-by: Daniel Kiper <[e-mail]>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/grub-core/script/yylex.l b/grub-core/script/yylex.l
-index 7b44c37b7..b7203c823 100644
+index 7b44c37b76..b7203c8230 100644
 --- a/grub-core/script/yylex.l
 +++ b/grub-core/script/yylex.l
 @@ -37,11 +37,11 @@
diff --git a/debian/patches/0083-safemath-Add-some-arithmetic-primitives-that-check-f.patch b/debian/patches/0082-safemath-Add-some-arithmetic-primitives-that-check-f.patch
 similarity index 96%
 rename from debian/patches/0083-safemath-Add-some-arithmetic-primitives-that-check-f.patch
 rename to debian/patches/0082-safemath-Add-some-arithmetic-primitives-that-check-f.patch
index 0862632..b87a7fb 100644
--- a/debian/patches/0083-safemath-Add-some-arithmetic-primitives-that-check-f.patch
+++ b/debian/patches/0082-safemath-Add-some-arithmetic-primitives-that-check-f.patch
@@ -1,4 +1,4 @@
-From 79fe92c7e4ae4b6fd13a3db8f1a2ae7729e0e265 Mon Sep 17 00:00:00 2001
+From daa399d191529cbbe465cfe3ecf5e90cada76786 Mon Sep 17 00:00:00 2001
 From: Peter Jones <[e-mail]>
 Date: Mon, 15 Jun 2020 10:58:42 -0400
 Subject: safemath: Add some arithmetic primitives that check for overflow
@@ -25,7 +25,7 @@ Reviewed-by: Daniel Kiper <[e-mail]>
  create mode 100644 include/grub/safemath.h
 
 diff --git a/INSTALL b/INSTALL
-index 342c158e9..991479b52 100644
+index 342c158e91..991479b521 100644
 --- a/INSTALL
 +++ b/INSTALL
 @@ -11,27 +11,9 @@ GRUB depends on some software packages installed into your system. If
@@ -59,7 +59,7 @@ index 342c158e9..991479b52 100644
  * GNU Bison 2.3 or later
  * GNU gettext 0.17 or later
 diff --git a/include/grub/compiler.h b/include/grub/compiler.h
-index c9e1d7a73..8f3be3ae7 100644
+index c9e1d7a73d..8f3be3ae70 100644
 --- a/include/grub/compiler.h
 +++ b/include/grub/compiler.h
 @@ -48,4 +48,12 @@
@@ -77,7 +77,7 @@ index c9e1d7a73..8f3be3ae7 100644
  #endif /* ! GRUB_COMPILER_HEADER */
 diff --git a/include/grub/safemath.h b/include/grub/safemath.h
 new file mode 100644
-index 000000000..c17b89bba
+index 0000000000..c17b89bba1
 --- /dev/null
 +++ b/include/grub/safemath.h
 @@ -0,0 +1,37 @@
diff --git a/debian/patches/0084-calloc-Make-sure-we-always-have-an-overflow-checking.patch b/debian/patches/0083-calloc-Make-sure-we-always-have-an-overflow-checking.patch
 similarity index 93%
 rename from debian/patches/0084-calloc-Make-sure-we-always-have-an-overflow-checking.patch
 rename to debian/patches/0083-calloc-Make-sure-we-always-have-an-overflow-checking.patch
index 581fe8d..6238eee 100644
--- a/debian/patches/0084-calloc-Make-sure-we-always-have-an-overflow-checking.patch
+++ b/debian/patches/0083-calloc-Make-sure-we-always-have-an-overflow-checking.patch
@@ -1,4 +1,4 @@
-From 9e7a74bc530afaad40667b397218615fde3e44ef Mon Sep 17 00:00:00 2001
+From 5cffb625b814199eff98b73c34a92879b17fd5ac Mon Sep 17 00:00:00 2001
 From: Peter Jones <[e-mail]>
 Date: Mon, 15 Jun 2020 12:15:29 -0400
 Subject: calloc: Make sure we always have an overflow-checking calloc()
@@ -22,7 +22,7 @@ Reviewed-by: Daniel Kiper <[e-mail]>
  7 files changed, 85 insertions(+), 3 deletions(-)
 
 diff --git a/grub-core/kern/emu/misc.c b/grub-core/kern/emu/misc.c
-index 65db79baa..dfd8a8ec4 100644
+index 65db79baa1..dfd8a8ec48 100644
 --- a/grub-core/kern/emu/misc.c
 +++ b/grub-core/kern/emu/misc.c
 @@ -85,6 +85,18 @@ grub_util_error (const char *fmt, ...)
@@ -45,7 +45,7 @@ index 65db79baa..dfd8a8ec4 100644
  xmalloc (grub_size_t size)
  {
 diff --git a/grub-core/kern/emu/mm.c b/grub-core/kern/emu/mm.c
-index f262e95e3..145b01d37 100644
+index f262e95e38..145b01d371 100644
 --- a/grub-core/kern/emu/mm.c
 +++ b/grub-core/kern/emu/mm.c
 @@ -25,6 +25,16 @@
@@ -66,7 +66,7 @@ index f262e95e3..145b01d37 100644
  grub_malloc (grub_size_t size)
  {
 diff --git a/grub-core/kern/mm.c b/grub-core/kern/mm.c
-index ee88ff611..f2822a836 100644
+index ee88ff6118..f2822a8364 100644
 --- a/grub-core/kern/mm.c
 +++ b/grub-core/kern/mm.c
 @@ -67,8 +67,10 @@
@@ -133,7 +133,7 @@ index ee88ff611..f2822a836 100644
  grub_debug_malloc (const char *file, int line, grub_size_t size)
  {
 diff --git a/grub-core/lib/libgcrypt_wrap/mem.c b/grub-core/lib/libgcrypt_wrap/mem.c
-index beeb661a3..74c6eafe5 100644
+index beeb661a3c..74c6eafe52 100644
 --- a/grub-core/lib/libgcrypt_wrap/mem.c
 +++ b/grub-core/lib/libgcrypt_wrap/mem.c
 @@ -4,6 +4,7 @@
@@ -169,7 +169,7 @@ index beeb661a3..74c6eafe5 100644
      grub_fatal ("gcry_xcalloc failed");
    return ret;
 diff --git a/grub-core/lib/posix_wrap/stdlib.h b/grub-core/lib/posix_wrap/stdlib.h
-index 3b46f47ff..7a8d385e9 100644
+index 3b46f47ff5..7a8d385e97 100644
 --- a/grub-core/lib/posix_wrap/stdlib.h
 +++ b/grub-core/lib/posix_wrap/stdlib.h
 @@ -21,6 +21,7 @@
@@ -195,7 +195,7 @@ index 3b46f47ff..7a8d385e9 100644
  
  static inline void *
 diff --git a/include/grub/emu/misc.h b/include/grub/emu/misc.h
-index ce464cfd0..ff9c48a64 100644
+index ce464cfd00..ff9c48a649 100644
 --- a/include/grub/emu/misc.h
 +++ b/include/grub/emu/misc.h
 @@ -47,6 +47,7 @@ grub_util_device_is_mapped (const char *dev);
@@ -207,7 +207,7 @@ index ce464cfd0..ff9c48a64 100644
  void * EXPORT_FUNC(xrealloc) (void *ptr, grub_size_t size) WARN_UNUSED_RESULT;
  char * EXPORT_FUNC(xstrdup) (const char *str) WARN_UNUSED_RESULT;
 diff --git a/include/grub/mm.h b/include/grub/mm.h
-index 28e2e53eb..9c38dd3ca 100644
+index 28e2e53eb3..9c38dd3ca5 100644
 --- a/include/grub/mm.h
 +++ b/include/grub/mm.h
 @@ -29,6 +29,7 @@
diff --git a/debian/patches/0085-calloc-Use-calloc-at-most-places.patch b/debian/patches/0084-calloc-Use-calloc-at-most-places.patch
 similarity index 92%
 rename from debian/patches/0085-calloc-Use-calloc-at-most-places.patch
 rename to debian/patches/0084-calloc-Use-calloc-at-most-places.patch
index f61aea6..ac5217f 100644
--- a/debian/patches/0085-calloc-Use-calloc-at-most-places.patch
+++ b/debian/patches/0084-calloc-Use-calloc-at-most-places.patch
@@ -1,4 +1,4 @@
-From 06f4fe53388df99fff7fd23620705901903de8a0 Mon Sep 17 00:00:00 2001
+From 855173c18eab34ad93f21f5c509fe0e91bfd1c44 Mon Sep 17 00:00:00 2001
 From: Peter Jones <[e-mail]>
 Date: Mon, 15 Jun 2020 12:26:01 -0400
 Subject: calloc: Use calloc() at most places
@@ -111,7 +111,7 @@ Reviewed-by: Daniel Kiper <[e-mail]>
  86 files changed, 176 insertions(+), 175 deletions(-)
 
 diff --git a/grub-core/bus/usb/usbhub.c b/grub-core/bus/usb/usbhub.c
-index 34a7ff1b5..a06cce302 100644
+index 34a7ff1b5f..a06cce302d 100644
 --- a/grub-core/bus/usb/usbhub.c
 +++ b/grub-core/bus/usb/usbhub.c
 @@ -149,8 +149,8 @@ grub_usb_add_hub (grub_usb_device_t dev)
@@ -137,7 +137,7 @@ index 34a7ff1b5..a06cce302 100644
      {
        grub_free (hub->devices);
 diff --git a/grub-core/commands/efi/lsefisystab.c b/grub-core/commands/efi/lsefisystab.c
-index 902788250..d29188efa 100644
+index 902788250e..d29188efaf 100644
 --- a/grub-core/commands/efi/lsefisystab.c
 +++ b/grub-core/commands/efi/lsefisystab.c
 @@ -73,7 +73,8 @@ grub_cmd_lsefisystab (struct grub_command *cmd __attribute__ ((unused)),
@@ -151,7 +151,7 @@ index 902788250..d29188efa 100644
        return grub_errno;
      *grub_utf16_to_utf8 ((grub_uint8_t *) vendor, st->firmware_vendor,
 diff --git a/grub-core/commands/legacycfg.c b/grub-core/commands/legacycfg.c
-index db7a8f002..5e3ec0d5e 100644
+index db7a8f0027..5e3ec0d5e4 100644
 --- a/grub-core/commands/legacycfg.c
 +++ b/grub-core/commands/legacycfg.c
 @@ -314,7 +314,7 @@ grub_cmd_legacy_kernel (struct grub_command *mycmd __attribute__ ((unused)),
@@ -182,7 +182,7 @@ index db7a8f002..5e3ec0d5e 100644
  	return grub_errno;
        grub_memcpy (newargs + 1, args, argc * sizeof (newargs[0]));
 diff --git a/grub-core/commands/menuentry.c b/grub-core/commands/menuentry.c
-index 2c5363da7..9164df744 100644
+index 2c5363da7f..9164df744a 100644
 --- a/grub-core/commands/menuentry.c
 +++ b/grub-core/commands/menuentry.c
 @@ -154,7 +154,7 @@ grub_normal_add_menu_entry (int argc, const char **args,
@@ -195,7 +195,7 @@ index 2c5363da7..9164df744 100644
      goto fail;
  
 diff --git a/grub-core/commands/nativedisk.c b/grub-core/commands/nativedisk.c
-index 699447d11..7c8f97f6a 100644
+index 699447d11e..7c8f97f6ad 100644
 --- a/grub-core/commands/nativedisk.c
 +++ b/grub-core/commands/nativedisk.c
 @@ -195,7 +195,7 @@ grub_cmd_nativedisk (grub_command_t cmd __attribute__ ((unused)),
@@ -208,7 +208,7 @@ index 699447d11..7c8f97f6a 100644
      return grub_errno;
  
 diff --git a/grub-core/commands/parttool.c b/grub-core/commands/parttool.c
-index 22b46b187..051e31320 100644
+index 22b46b1874..051e31320e 100644
 --- a/grub-core/commands/parttool.c
 +++ b/grub-core/commands/parttool.c
 @@ -59,7 +59,13 @@ grub_parttool_register(const char *part_name,
@@ -245,7 +245,7 @@ index 22b46b187..051e31320 100644
  	  if (! parsed[j])
  	    {
 diff --git a/grub-core/commands/regexp.c b/grub-core/commands/regexp.c
-index f00b184c8..4019164f3 100644
+index f00b184c81..4019164f36 100644
 --- a/grub-core/commands/regexp.c
 +++ b/grub-core/commands/regexp.c
 @@ -116,7 +116,7 @@ grub_cmd_regexp (grub_extcmd_context_t ctxt, int argc, char **args)
@@ -258,7 +258,7 @@ index f00b184c8..4019164f3 100644
      goto fail;
  
 diff --git a/grub-core/commands/search_wrap.c b/grub-core/commands/search_wrap.c
-index d7fd26b94..47fc8eb99 100644
+index d7fd26b940..47fc8eb996 100644
 --- a/grub-core/commands/search_wrap.c
 +++ b/grub-core/commands/search_wrap.c
 @@ -122,7 +122,7 @@ grub_cmd_search (grub_extcmd_context_t ctxt, int argc, char **args)
@@ -271,7 +271,7 @@ index d7fd26b94..47fc8eb99 100644
      return grub_errno;
    j = 0;
 diff --git a/grub-core/disk/diskfilter.c b/grub-core/disk/diskfilter.c
-index c3b578acf..68ca9e0be 100644
+index c3b578acf2..68ca9e0be9 100644
 --- a/grub-core/disk/diskfilter.c
 +++ b/grub-core/disk/diskfilter.c
 @@ -1134,7 +1134,7 @@ grub_diskfilter_make_raid (grub_size_t uuidlen, char *uuid, int nmemb,
@@ -293,7 +293,7 @@ index c3b578acf..68ca9e0be 100644
  	  for (p = disk->partition; p; p = p->parent)
  	    pv->partmaps[s++] = xstrdup (p->partmap->name);
 diff --git a/grub-core/disk/ieee1275/ofdisk.c b/grub-core/disk/ieee1275/ofdisk.c
-index f73257e66..03674cb47 100644
+index f73257e66d..03674cb477 100644
 --- a/grub-core/disk/ieee1275/ofdisk.c
 +++ b/grub-core/disk/ieee1275/ofdisk.c
 @@ -297,7 +297,7 @@ dev_iterate (const struct grub_ieee1275_devalias *alias)
@@ -306,7 +306,7 @@ index f73257e66..03674cb47 100644
        if (!table)
          {
 diff --git a/grub-core/disk/ldm.c b/grub-core/disk/ldm.c
-index 2a22d2d6c..e6323701a 100644
+index 2a22d2d6c1..e6323701ab 100644
 --- a/grub-core/disk/ldm.c
 +++ b/grub-core/disk/ldm.c
 @@ -323,8 +323,8 @@ make_vg (grub_disk_t disk,
@@ -352,7 +352,7 @@ index 2a22d2d6c..e6323701a 100644
  	return grub_errno;
        for (i = 0; i < *nsectors; i++)
 diff --git a/grub-core/disk/luks.c b/grub-core/disk/luks.c
-index 86c50c612..18b3a8bb1 100644
+index 86c50c6121..18b3a8bb1d 100644
 --- a/grub-core/disk/luks.c
 +++ b/grub-core/disk/luks.c
 @@ -336,7 +336,7 @@ luks_recover_key (grub_disk_t source,
@@ -365,7 +365,7 @@ index 86c50c612..18b3a8bb1 100644
      return grub_errno;
  
 diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c
-index 7b265c780..d1df640b3 100644
+index 7b265c780c..d1df640b31 100644
 --- a/grub-core/disk/lvm.c
 +++ b/grub-core/disk/lvm.c
 @@ -173,7 +173,7 @@ grub_lvm_detect (grub_disk_t disk,
@@ -398,7 +398,7 @@ index 7b265c780..d1df640b3 100644
  
  		      p = grub_strstr (p, "stripes = [");
 diff --git a/grub-core/disk/xen/xendisk.c b/grub-core/disk/xen/xendisk.c
-index 48476cbbf..d6612eebd 100644
+index 48476cbbf9..d6612eebd7 100644
 --- a/grub-core/disk/xen/xendisk.c
 +++ b/grub-core/disk/xen/xendisk.c
 @@ -426,7 +426,7 @@ grub_xendisk_init (void)
@@ -411,7 +411,7 @@ index 48476cbbf..d6612eebd 100644
      return;
    if (grub_xenstore_dir ("device/vbd", fill, &ctr))
 diff --git a/grub-core/efiemu/loadcore.c b/grub-core/efiemu/loadcore.c
-index 44085ef81..2b924623f 100644
+index 44085ef818..2b924623f5 100644
 --- a/grub-core/efiemu/loadcore.c
 +++ b/grub-core/efiemu/loadcore.c
 @@ -201,7 +201,7 @@ grub_efiemu_count_symbols (const Elf_Ehdr *e)
@@ -424,7 +424,7 @@ index 44085ef81..2b924623f 100644
    /* Relocators */
    for (i = 0, s = (Elf_Shdr *) ((char *) e + e->e_shoff);
 diff --git a/grub-core/efiemu/mm.c b/grub-core/efiemu/mm.c
-index 52a032f7b..9b8e0d0ad 100644
+index 52a032f7b2..9b8e0d0ad1 100644
 --- a/grub-core/efiemu/mm.c
 +++ b/grub-core/efiemu/mm.c
 @@ -554,11 +554,11 @@ grub_efiemu_mmap_sort_and_uniq (void)
@@ -451,7 +451,7 @@ index 52a032f7b..9b8e0d0ad 100644
      {
        grub_efiemu_unload ();
 diff --git a/grub-core/font/font.c b/grub-core/font/font.c
-index 85a292557..8e118b315 100644
+index 85a292557a..8e118b315c 100644
 --- a/grub-core/font/font.c
 +++ b/grub-core/font/font.c
 @@ -293,8 +293,7 @@ load_font_index (grub_file_t file, grub_uint32_t sect_length, struct
@@ -465,7 +465,7 @@ index 85a292557..8e118b315 100644
      return 1;
    font->bmp_idx = grub_malloc (0x10000 * sizeof (grub_uint16_t));
 diff --git a/grub-core/fs/affs.c b/grub-core/fs/affs.c
-index 6b6a2bc91..220b3712f 100644
+index 6b6a2bc913..220b3712f2 100644
 --- a/grub-core/fs/affs.c
 +++ b/grub-core/fs/affs.c
 @@ -301,7 +301,7 @@ grub_affs_read_symlink (grub_fshelp_node_t node)
@@ -496,7 +496,7 @@ index 6b6a2bc91..220b3712f 100644
  	*grub_latin1_to_utf8 ((grub_uint8_t *) *label, file.name, len) = '\0';
      }
 diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
-index 48bd3d04a..11272efc1 100644
+index 48bd3d04a5..11272efc1a 100644
 --- a/grub-core/fs/btrfs.c
 +++ b/grub-core/fs/btrfs.c
 @@ -413,7 +413,7 @@ lower_bound (struct grub_btrfs_data *data,
@@ -527,7 +527,7 @@ index 48bd3d04a..11272efc1 100644
      return grub_errno;
    for (i = 0; i < *nsectors; i++)
 diff --git a/grub-core/fs/hfs.c b/grub-core/fs/hfs.c
-index ac0a40990..3fe842b4d 100644
+index ac0a40990e..3fe842b4d8 100644
 --- a/grub-core/fs/hfs.c
 +++ b/grub-core/fs/hfs.c
 @@ -1360,7 +1360,7 @@ grub_hfs_label (grub_device_t device, char **label)
@@ -540,7 +540,7 @@ index ac0a40990..3fe842b4d 100644
  	macroman_to_utf8 (*label, data->sblock.volname + 1,
  			  len + 1, 0);
 diff --git a/grub-core/fs/hfsplus.c b/grub-core/fs/hfsplus.c
-index 54786bb1c..dae43becc 100644
+index 54786bb1c6..dae43becc9 100644
 --- a/grub-core/fs/hfsplus.c
 +++ b/grub-core/fs/hfsplus.c
 @@ -720,7 +720,7 @@ list_nodes (void *record, void *hook_arg)
@@ -571,7 +571,7 @@ index 54786bb1c..dae43becc 100644
      {
        grub_free (label_name);
 diff --git a/grub-core/fs/iso9660.c b/grub-core/fs/iso9660.c
-index 49c0c632b..4f1b52a55 100644
+index 49c0c632bf..4f1b52a552 100644
 --- a/grub-core/fs/iso9660.c
 +++ b/grub-core/fs/iso9660.c
 @@ -331,7 +331,7 @@ grub_iso9660_convert_string (grub_uint8_t *us, int len)
@@ -584,7 +584,7 @@ index 49c0c632b..4f1b52a55 100644
      return NULL;
  
 diff --git a/grub-core/fs/ntfs.c b/grub-core/fs/ntfs.c
-index fc4e1f678..2f34f76da 100644
+index fc4e1f678d..2f34f76da8 100644
 --- a/grub-core/fs/ntfs.c
 +++ b/grub-core/fs/ntfs.c
 @@ -556,8 +556,8 @@ get_utf8 (grub_uint8_t *in, grub_size_t len)
@@ -599,7 +599,7 @@ index fc4e1f678..2f34f76da 100644
      {
        grub_free (buf);
 diff --git a/grub-core/fs/sfs.c b/grub-core/fs/sfs.c
-index 50c1fe72f..90f7fb379 100644
+index 50c1fe72f4..90f7fb3791 100644
 --- a/grub-core/fs/sfs.c
 +++ b/grub-core/fs/sfs.c
 @@ -266,7 +266,7 @@ grub_sfs_read_block (grub_fshelp_node_t node, grub_disk_addr_t fileblock)
@@ -612,7 +612,7 @@ index 50c1fe72f..90f7fb379 100644
  	{
  	  grub_errno = 0;
 diff --git a/grub-core/fs/tar.c b/grub-core/fs/tar.c
-index 7d63e0c99..c551ed6b5 100644
+index 7d63e0c99c..c551ed6b52 100644
 --- a/grub-core/fs/tar.c
 +++ b/grub-core/fs/tar.c
 @@ -120,7 +120,7 @@ grub_cpio_find_file (struct grub_archelp_data *data, char **name,
@@ -625,7 +625,7 @@ index 7d63e0c99..c551ed6b5 100644
  		return grub_errno;
  	      grub_free (data->linkname);
 diff --git a/grub-core/fs/udf.c b/grub-core/fs/udf.c
-index dc8b6e2d1..a83761674 100644
+index dc8b6e2d1c..a83761674a 100644
 --- a/grub-core/fs/udf.c
 +++ b/grub-core/fs/udf.c
 @@ -873,7 +873,7 @@ read_string (const grub_uint8_t *raw, grub_size_t sz, char *outbuf)
@@ -647,7 +647,7 @@ index dc8b6e2d1..a83761674 100644
  	return NULL;
        for (i = 0; i < utf16len; i++)
 diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c
-index 2f72e42bf..381dde556 100644
+index 2f72e42bf8..381dde556d 100644
 --- a/grub-core/fs/zfs/zfs.c
 +++ b/grub-core/fs/zfs/zfs.c
 @@ -3325,7 +3325,7 @@ dnode_get_fullpath (const char *fullpath, struct subvolume *subvol,
@@ -669,7 +669,7 @@ index 2f72e42bf..381dde556 100644
      return grub_errno;
    for (i = 0; i < *nsectors; i++)
 diff --git a/grub-core/gfxmenu/gui_string_util.c b/grub-core/gfxmenu/gui_string_util.c
-index a9a415e31..ba1e1eab3 100644
+index a9a415e312..ba1e1eab31 100644
 --- a/grub-core/gfxmenu/gui_string_util.c
 +++ b/grub-core/gfxmenu/gui_string_util.c
 @@ -55,7 +55,7 @@ canonicalize_path (const char *path)
@@ -682,7 +682,7 @@ index a9a415e31..ba1e1eab3 100644
      return 0;
  
 diff --git a/grub-core/gfxmenu/widget-box.c b/grub-core/gfxmenu/widget-box.c
-index b60602889..470597ded 100644
+index b606028891..470597ded2 100644
 --- a/grub-core/gfxmenu/widget-box.c
 +++ b/grub-core/gfxmenu/widget-box.c
 @@ -303,10 +303,10 @@ grub_gfxmenu_create_box (const char *pixmaps_prefix,
@@ -699,7 +699,7 @@ index b60602889..470597ded 100644
    /* Initialize all pixmap pointers to NULL so that proper destruction can
       be performed if an error is encountered partway through construction.  */
 diff --git a/grub-core/io/gzio.c b/grub-core/io/gzio.c
-index 6208a9763..43d98a7bd 100644
+index 6208a97636..43d98a7bdf 100644
 --- a/grub-core/io/gzio.c
 +++ b/grub-core/io/gzio.c
 @@ -554,7 +554,7 @@ huft_build (unsigned *b,	/* code lengths in bits (all assumed <= BMAX) */
@@ -712,7 +712,7 @@ index 6208a9763..43d98a7bd 100644
  		{
  		  if (h)
 diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
-index 6e1ceb905..dc31caa21 100644
+index 6e1ceb9051..dc31caa213 100644
 --- a/grub-core/kern/efi/efi.c
 +++ b/grub-core/kern/efi/efi.c
 @@ -202,7 +202,7 @@ grub_efi_set_variable(const char *var, const grub_efi_guid_t *guid,
@@ -743,7 +743,7 @@ index 6e1ceb905..dc31caa21 100644
  	    {
  	      grub_free (name);
 diff --git a/grub-core/kern/emu/hostdisk.c b/grub-core/kern/emu/hostdisk.c
-index 8ac523953..f90b6c9ce 100644
+index 8ac5239538..f90b6c9ce4 100644
 --- a/grub-core/kern/emu/hostdisk.c
 +++ b/grub-core/kern/emu/hostdisk.c
 @@ -627,7 +627,7 @@ static char *
@@ -756,7 +756,7 @@ index 8ac523953..f90b6c9ce 100644
    size_t i;
    int first = 1;
 diff --git a/grub-core/kern/fs.c b/grub-core/kern/fs.c
-index 2b85f4950..f90be6566 100644
+index 2b85f4950b..f90be6566b 100644
 --- a/grub-core/kern/fs.c
 +++ b/grub-core/kern/fs.c
 @@ -151,7 +151,7 @@ grub_fs_blocklist_open (grub_file_t file, const char *name)
@@ -769,7 +769,7 @@ index 2b85f4950..f90be6566 100644
      return 0;
  
 diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
-index 18cad5803..83c068d61 100644
+index 18cad5803b..83c068d61b 100644
 --- a/grub-core/kern/misc.c
 +++ b/grub-core/kern/misc.c
 @@ -691,7 +691,7 @@ parse_printf_args (const char *fmt0, struct printf_args *args,
@@ -782,7 +782,7 @@ index 18cad5803..83c068d61 100644
  	{
  	  grub_errno = GRUB_ERR_NONE;
 diff --git a/grub-core/kern/parser.c b/grub-core/kern/parser.c
-index 78175aac2..619db3122 100644
+index 78175aac2d..619db3122a 100644
 --- a/grub-core/kern/parser.c
 +++ b/grub-core/kern/parser.c
 @@ -213,7 +213,7 @@ grub_parser_split_cmdline (const char *cmdline,
@@ -795,7 +795,7 @@ index 78175aac2..619db3122 100644
      {
        grub_free (args);
 diff --git a/grub-core/kern/uboot/uboot.c b/grub-core/kern/uboot/uboot.c
-index be4816fe6..aac8f9ae1 100644
+index be4816fe6f..aac8f9ae1f 100644
 --- a/grub-core/kern/uboot/uboot.c
 +++ b/grub-core/kern/uboot/uboot.c
 @@ -133,7 +133,7 @@ grub_uboot_dev_enum (void)
@@ -808,7 +808,7 @@ index be4816fe6..aac8f9ae1 100644
      return 0;
  
 diff --git a/grub-core/lib/libgcrypt/cipher/ac.c b/grub-core/lib/libgcrypt/cipher/ac.c
-index f5e946a2d..63f6fcd11 100644
+index f5e946a2d8..63f6fcd11e 100644
 --- a/grub-core/lib/libgcrypt/cipher/ac.c
 +++ b/grub-core/lib/libgcrypt/cipher/ac.c
 @@ -185,7 +185,7 @@ ac_data_mpi_copy (gcry_ac_mpi_t *data_mpis, unsigned int data_mpis_n,
@@ -848,7 +848,7 @@ index f5e946a2d..63f6fcd11 100644
      {
        err = gcry_error_from_errno (errno);
 diff --git a/grub-core/lib/libgcrypt/cipher/primegen.c b/grub-core/lib/libgcrypt/cipher/primegen.c
-index 2788e349f..b12e79b19 100644
+index 2788e349fa..b12e79b192 100644
 --- a/grub-core/lib/libgcrypt/cipher/primegen.c
 +++ b/grub-core/lib/libgcrypt/cipher/primegen.c
 @@ -383,7 +383,7 @@ prime_generate_internal (int need_q_factor,
@@ -870,7 +870,7 @@ index 2788e349f..b12e79b19 100644
    val_2  = mpi_alloc_set_ui( 2 );
    val_3 = mpi_alloc_set_ui( 3);
 diff --git a/grub-core/lib/libgcrypt/cipher/pubkey.c b/grub-core/lib/libgcrypt/cipher/pubkey.c
-index 910982141..ca087ad75 100644
+index 910982141e..ca087ad75b 100644
 --- a/grub-core/lib/libgcrypt/cipher/pubkey.c
 +++ b/grub-core/lib/libgcrypt/cipher/pubkey.c
 @@ -2941,7 +2941,7 @@ gcry_pk_encrypt (gcry_sexp_t *r_ciph, gcry_sexp_t s_data, gcry_sexp_t s_pkey)
@@ -892,7 +892,7 @@ index 910982141..ca087ad75 100644
          {
            rc = gpg_err_code_from_syserror ();
 diff --git a/grub-core/lib/priority_queue.c b/grub-core/lib/priority_queue.c
-index 659be0b7f..7d5e7c05a 100644
+index 659be0b7f4..7d5e7c05aa 100644
 --- a/grub-core/lib/priority_queue.c
 +++ b/grub-core/lib/priority_queue.c
 @@ -92,7 +92,7 @@ grub_priority_queue_new (grub_size_t elsize,
@@ -905,7 +905,7 @@ index 659be0b7f..7d5e7c05a 100644
      return 0;
    ret = (struct grub_priority_queue *) grub_malloc (sizeof (*ret));
 diff --git a/grub-core/lib/reed_solomon.c b/grub-core/lib/reed_solomon.c
-index ee9fa7b4f..467305b46 100644
+index ee9fa7b4fe..467305b46a 100644
 --- a/grub-core/lib/reed_solomon.c
 +++ b/grub-core/lib/reed_solomon.c
 @@ -20,6 +20,7 @@
@@ -931,7 +931,7 @@ index ee9fa7b4f..467305b46 100644
    /* Multiply with X - a^r */
    for (j = 0; j < rs; j++)
 diff --git a/grub-core/lib/relocator.c b/grub-core/lib/relocator.c
-index ea3ebc719..5847aac36 100644
+index ea3ebc719b..5847aac364 100644
 --- a/grub-core/lib/relocator.c
 +++ b/grub-core/lib/relocator.c
 @@ -495,9 +495,9 @@ malloc_in_range (struct grub_relocator *rel,
@@ -967,7 +967,7 @@ index ea3ebc719..5847aac36 100644
        {
  	grub_free (from);
 diff --git a/grub-core/lib/zstd/fse_decompress.c b/grub-core/lib/zstd/fse_decompress.c
-index 72bbead5b..2227b84bc 100644
+index 72bbead5be..2227b84bc7 100644
 --- a/grub-core/lib/zstd/fse_decompress.c
 +++ b/grub-core/lib/zstd/fse_decompress.c
 @@ -82,7 +82,7 @@
@@ -980,7 +980,7 @@ index 72bbead5b..2227b84bc 100644
  
  void FSE_freeDTable (FSE_DTable* dt)
 diff --git a/grub-core/loader/arm/linux.c b/grub-core/loader/arm/linux.c
-index 092e8e307..979d425df 100644
+index 092e8e3077..979d425dfb 100644
 --- a/grub-core/loader/arm/linux.c
 +++ b/grub-core/loader/arm/linux.c
 @@ -82,7 +82,7 @@ linux_prepare_atag (void *target_atag)
@@ -993,7 +993,7 @@ index 092e8e307..979d425df 100644
      return grub_errno;
  
 diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
-index 04e815c05..b9a2df34b 100644
+index 04e815c052..b9a2df34b1 100644
 --- a/grub-core/loader/efi/chainloader.c
 +++ b/grub-core/loader/efi/chainloader.c
 @@ -126,7 +126,7 @@ copy_file_path (grub_efi_file_path_device_path_t *fp,
@@ -1006,7 +1006,7 @@ index 04e815c05..b9a2df34b 100644
      return;
  
 diff --git a/grub-core/loader/i386/bsdXX.c b/grub-core/loader/i386/bsdXX.c
-index af6741d15..a8d8bf7da 100644
+index af6741d157..a8d8bf7dae 100644
 --- a/grub-core/loader/i386/bsdXX.c
 +++ b/grub-core/loader/i386/bsdXX.c
 @@ -48,7 +48,7 @@ read_headers (grub_file_t file, const char *filename, Elf_Ehdr *e, char **shdr)
@@ -1019,7 +1019,7 @@ index af6741d15..a8d8bf7da 100644
      return grub_errno;
  
 diff --git a/grub-core/loader/i386/xnu.c b/grub-core/loader/i386/xnu.c
-index e64ed08f5..b7d176b5d 100644
+index e64ed08f58..b7d176b5d3 100644
 --- a/grub-core/loader/i386/xnu.c
 +++ b/grub-core/loader/i386/xnu.c
 @@ -295,7 +295,7 @@ grub_xnu_devprop_add_property_utf8 (struct grub_xnu_devprop_device_descriptor *d
@@ -1041,7 +1041,7 @@ index e64ed08f5..b7d176b5d 100644
      return grub_errno;
    grub_memcpy (utf16, name, sizeof (grub_uint16_t) * namelen);
 diff --git a/grub-core/loader/macho.c b/grub-core/loader/macho.c
-index 085f9c689..05710c48e 100644
+index 085f9c6890..05710c48e0 100644
 --- a/grub-core/loader/macho.c
 +++ b/grub-core/loader/macho.c
 @@ -97,7 +97,7 @@ grub_macho_file (grub_file_t file, const char *filename, int is_64bit)
@@ -1054,7 +1054,7 @@ index 085f9c689..05710c48e 100644
  	goto fail;
        if (grub_file_read (macho->file, archs,
 diff --git a/grub-core/loader/multiboot_elfxx.c b/grub-core/loader/multiboot_elfxx.c
-index 70cd1db51..cc6853692 100644
+index 70cd1db513..cc6853692a 100644
 --- a/grub-core/loader/multiboot_elfxx.c
 +++ b/grub-core/loader/multiboot_elfxx.c
 @@ -217,7 +217,7 @@ CONCAT(grub_multiboot_load_elf, XX) (mbi_load_data_t *mld)
@@ -1067,7 +1067,7 @@ index 70cd1db51..cc6853692 100644
  	return grub_errno;
        
 diff --git a/grub-core/loader/xnu.c b/grub-core/loader/xnu.c
-index e0f47e72b..2f0ebd0b8 100644
+index e0f47e72b0..2f0ebd0b8b 100644
 --- a/grub-core/loader/xnu.c
 +++ b/grub-core/loader/xnu.c
 @@ -801,7 +801,7 @@ grub_cmd_xnu_mkext (grub_command_t cmd __attribute__ ((unused)),
@@ -1080,7 +1080,7 @@ index e0f47e72b..2f0ebd0b8 100644
  	{
  	  grub_file_close (file);
 diff --git a/grub-core/mmap/mmap.c b/grub-core/mmap/mmap.c
-index 6a31cbae3..57b4e9a72 100644
+index 6a31cbae32..57b4e9a72a 100644
 --- a/grub-core/mmap/mmap.c
 +++ b/grub-core/mmap/mmap.c
 @@ -143,9 +143,9 @@ grub_mmap_iterate (grub_memory_hook_t hook, void *hook_data)
@@ -1096,7 +1096,7 @@ index 6a31cbae3..57b4e9a72 100644
    if (! ctx.scanline_events || !present)
      {
 diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
-index 558d97ba1..dd0ffcdae 100644
+index 558d97ba1e..dd0ffcdaea 100644
 --- a/grub-core/net/bootp.c
 +++ b/grub-core/net/bootp.c
 @@ -1559,7 +1559,7 @@ grub_cmd_bootp (struct grub_command *cmd __attribute__ ((unused)),
@@ -1109,7 +1109,7 @@ index 558d97ba1..dd0ffcdae 100644
      return grub_errno;
  
 diff --git a/grub-core/net/dns.c b/grub-core/net/dns.c
-index 5d9afe093..e332d5eb4 100644
+index 5d9afe093c..e332d5eb4a 100644
 --- a/grub-core/net/dns.c
 +++ b/grub-core/net/dns.c
 @@ -285,8 +285,8 @@ recv_hook (grub_net_udp_socket_t sock __attribute__ ((unused)),
@@ -1144,7 +1144,7 @@ index 5d9afe093..e332d5eb4 100644
      return grub_errno;
  
 diff --git a/grub-core/net/net.c b/grub-core/net/net.c
-index b917a75d5..fed7bc57c 100644
+index b917a75d54..fed7bc57cb 100644
 --- a/grub-core/net/net.c
 +++ b/grub-core/net/net.c
 @@ -333,8 +333,8 @@ grub_cmd_ipv6_autoconf (struct grub_command *cmd __attribute__ ((unused)),
@@ -1159,7 +1159,7 @@ index b917a75d5..fed7bc57c 100644
      {
        grub_free (ifaces);
 diff --git a/grub-core/normal/charset.c b/grub-core/normal/charset.c
-index b0ab47d73..d57fb72fa 100644
+index b0ab47d73f..d57fb72faa 100644
 --- a/grub-core/normal/charset.c
 +++ b/grub-core/normal/charset.c
 @@ -203,7 +203,7 @@ grub_utf8_to_ucs4_alloc (const char *msg, grub_uint32_t **unicode_msg,
@@ -1201,7 +1201,7 @@ index b0ab47d73..d57fb72fa 100644
      return -1;
    for (ptr = logical; ptr <= logical + logical_len; ptr++)
 diff --git a/grub-core/normal/cmdline.c b/grub-core/normal/cmdline.c
-index c037d5050..c57242e2e 100644
+index c037d5050e..c57242e2ea 100644
 --- a/grub-core/normal/cmdline.c
 +++ b/grub-core/normal/cmdline.c
 @@ -41,7 +41,7 @@ grub_err_t
@@ -1268,7 +1268,7 @@ index c037d5050..c57242e2e 100644
  		{
  		  grub_print_error ();
 diff --git a/grub-core/normal/menu_entry.c b/grub-core/normal/menu_entry.c
-index cdf3590a3..1993995be 100644
+index cdf3590a36..1993995be6 100644
 --- a/grub-core/normal/menu_entry.c
 +++ b/grub-core/normal/menu_entry.c
 @@ -95,8 +95,8 @@ init_line (struct screen *screen, struct line *linep)
@@ -1328,7 +1328,7 @@ index cdf3590a3..1993995be 100644
      {
        grub_print_error ();
 diff --git a/grub-core/normal/menu_text.c b/grub-core/normal/menu_text.c
-index e22bb91f6..18240e76c 100644
+index e22bb91f6e..18240e76ce 100644
 --- a/grub-core/normal/menu_text.c
 +++ b/grub-core/normal/menu_text.c
 @@ -78,7 +78,7 @@ grub_print_message_indented_real (const char *msg, int margin_left,
@@ -1350,7 +1350,7 @@ index e22bb91f6..18240e76c 100644
      /* XXX How to show this error?  */
      return;
 diff --git a/grub-core/normal/term.c b/grub-core/normal/term.c
-index a1e5c5a0d..cc8c173b6 100644
+index a1e5c5a0da..cc8c173b6e 100644
 --- a/grub-core/normal/term.c
 +++ b/grub-core/normal/term.c
 @@ -264,7 +264,7 @@ grub_term_save_pos (void)
@@ -1372,7 +1372,7 @@ index a1e5c5a0d..cc8c173b6 100644
    grub_error_pop ();
  
 diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c
-index 7adc0f30e..a5bd0752f 100644
+index 7adc0f30ee..a5bd0752fb 100644
 --- a/grub-core/osdep/linux/getroot.c
 +++ b/grub-core/osdep/linux/getroot.c
 @@ -168,7 +168,7 @@ grub_util_raid_getmembers (const char *name, int bootable)
@@ -1403,7 +1403,7 @@ index 7adc0f30e..a5bd0752f 100644
  again:
    fp = grub_util_fopen ("/proc/self/mountinfo", "r");
 diff --git a/grub-core/osdep/unix/config.c b/grub-core/osdep/unix/config.c
-index 5478030fd..89dc70d93 100644
+index 5478030fde..89dc70d93c 100644
 --- a/grub-core/osdep/unix/config.c
 +++ b/grub-core/osdep/unix/config.c
 @@ -130,7 +130,7 @@ grub_util_load_config (struct grub_util_config *cfg)
@@ -1416,7 +1416,7 @@ index 5478030fd..89dc70d93 100644
    if (grub_util_is_regular (cfgfile))
      sorted_cfgpaths[i++] = xstrdup (cfgfile);
 diff --git a/grub-core/osdep/windows/getroot.c b/grub-core/osdep/windows/getroot.c
-index 661d95461..eada663b2 100644
+index 661d954619..eada663b26 100644
 --- a/grub-core/osdep/windows/getroot.c
 +++ b/grub-core/osdep/windows/getroot.c
 @@ -59,7 +59,7 @@ grub_get_mount_point (const TCHAR *path)
@@ -1429,7 +1429,7 @@ index 661d95461..eada663b2 100644
    /* When pointing to EFI system partition GetVolumePathName fails
       for ESP root and returns abberant information for everything
 diff --git a/grub-core/osdep/windows/hostdisk.c b/grub-core/osdep/windows/hostdisk.c
-index 355100789..0be327394 100644
+index 355100789a..0be3273949 100644
 --- a/grub-core/osdep/windows/hostdisk.c
 +++ b/grub-core/osdep/windows/hostdisk.c
 @@ -111,7 +111,7 @@ grub_util_get_windows_path_real (const char *path)
@@ -1451,7 +1451,7 @@ index 355100789..0be327394 100644
    pattern[l] = '\\';
    pattern[l + 1] = '*';
 diff --git a/grub-core/osdep/windows/init.c b/grub-core/osdep/windows/init.c
-index e8ffd62c6..6297de632 100644
+index e8ffd62c6a..6297de6326 100644
 --- a/grub-core/osdep/windows/init.c
 +++ b/grub-core/osdep/windows/init.c
 @@ -161,7 +161,7 @@ grub_util_host_init (int *argc __attribute__ ((unused)),
@@ -1464,7 +1464,7 @@ index e8ffd62c6..6297de632 100644
    for (i = 0; i < *argc; i++)
      (*argv)[i] = grub_util_tchar_to_utf8 (targv[i]); 
 diff --git a/grub-core/osdep/windows/platform.c b/grub-core/osdep/windows/platform.c
-index a3f738fb9..b160949d8 100644
+index a3f738fb9b..b160949d8e 100644
 --- a/grub-core/osdep/windows/platform.c
 +++ b/grub-core/osdep/windows/platform.c
 @@ -231,8 +231,8 @@ grub_install_register_efi (grub_device_t efidir_grub_dev, const char *efidir,
@@ -1479,7 +1479,7 @@ index a3f738fb9..b160949d8 100644
  				      (const grub_uint8_t *) efi_distributor,
  				      distrib8_len, 0);
 diff --git a/grub-core/osdep/windows/relpath.c b/grub-core/osdep/windows/relpath.c
-index cb0861744..478e8ef14 100644
+index cb0861744a..478e8ef14d 100644
 --- a/grub-core/osdep/windows/relpath.c
 +++ b/grub-core/osdep/windows/relpath.c
 @@ -72,7 +72,7 @@ grub_make_system_path_relative_to_its_root (const char *path)
@@ -1492,7 +1492,7 @@ index cb0861744..478e8ef14 100644
        && dirwindows[offset] != '/'
        && dirwindows[offset])
 diff --git a/grub-core/partmap/gpt.c b/grub-core/partmap/gpt.c
-index 103f6796f..72a2e37cd 100644
+index 103f6796f3..72a2e37cd4 100644
 --- a/grub-core/partmap/gpt.c
 +++ b/grub-core/partmap/gpt.c
 @@ -199,7 +199,7 @@ gpt_partition_map_embed (struct grub_disk *disk, unsigned int *nsectors,
@@ -1505,7 +1505,7 @@ index 103f6796f..72a2e37cd 100644
      return grub_errno;
    for (i = 0; i < *nsectors; i++)
 diff --git a/grub-core/partmap/msdos.c b/grub-core/partmap/msdos.c
-index 7b8e45076..ee3f24982 100644
+index 7b8e450762..ee3f24982b 100644
 --- a/grub-core/partmap/msdos.c
 +++ b/grub-core/partmap/msdos.c
 @@ -337,7 +337,7 @@ pc_partition_map_embed (struct grub_disk *disk, unsigned int *nsectors,
@@ -1518,7 +1518,7 @@ index 7b8e45076..ee3f24982 100644
  	return grub_errno;
        for (i = 0; i < *nsectors; i++)
 diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c
-index ee299fd0e..c8d6806fe 100644
+index ee299fd0ea..c8d6806fe0 100644
 --- a/grub-core/script/execute.c
 +++ b/grub-core/script/execute.c
 @@ -553,7 +553,7 @@ gettext_append (struct grub_script_argv *result, const char *orig_str)
@@ -1531,7 +1531,7 @@ index ee299fd0e..c8d6806fe 100644
    if (parse_string (orig_str, gettext_save_allow, &ctx, 0))
      goto fail;
 diff --git a/grub-core/tests/fake_input.c b/grub-core/tests/fake_input.c
-index 2d6085298..b5eb516be 100644
+index 2d60852989..b5eb516be2 100644
 --- a/grub-core/tests/fake_input.c
 +++ b/grub-core/tests/fake_input.c
 @@ -49,7 +49,7 @@ grub_terminal_input_fake_sequence (int *seq_in, int nseq_in)
@@ -1544,7 +1544,7 @@ index 2d6085298..b5eb516be 100644
      return;
  
 diff --git a/grub-core/tests/video_checksum.c b/grub-core/tests/video_checksum.c
-index 74d5b65e5..44d081069 100644
+index 74d5b65e5c..44d0810698 100644
 --- a/grub-core/tests/video_checksum.c
 +++ b/grub-core/tests/video_checksum.c
 @@ -336,7 +336,7 @@ grub_video_capture_write_bmp (const char *fname,
@@ -1575,7 +1575,7 @@ index 74d5b65e5..44d081069 100644
  	grub_uint16_t gmask = ((1 << mode_info->green_mask_size) - 1);
  	grub_uint16_t bmask = ((1 << mode_info->blue_mask_size) - 1);
 diff --git a/grub-core/video/capture.c b/grub-core/video/capture.c
-index 4f83c7441..4d3195e01 100644
+index 4f83c74411..4d3195e017 100644
 --- a/grub-core/video/capture.c
 +++ b/grub-core/video/capture.c
 @@ -89,7 +89,7 @@ grub_video_capture_start (const struct grub_video_mode_info *mode_info,
@@ -1588,7 +1588,7 @@ index 4f83c7441..4d3195e01 100644
      return grub_errno;
    
 diff --git a/grub-core/video/emu/sdl.c b/grub-core/video/emu/sdl.c
-index a2f639f66..0ebab6f57 100644
+index a2f639f66d..0ebab6f57d 100644
 --- a/grub-core/video/emu/sdl.c
 +++ b/grub-core/video/emu/sdl.c
 @@ -172,7 +172,7 @@ grub_video_sdl_set_palette (unsigned int start, unsigned int count,
@@ -1601,7 +1601,7 @@ index a2f639f66..0ebab6f57 100644
  	{
  	  tmp[i].r = palette_data[i].r;
 diff --git a/grub-core/video/i386/pc/vga.c b/grub-core/video/i386/pc/vga.c
-index 01f47112d..b2f776c99 100644
+index 01f47112d3..b2f776c997 100644
 --- a/grub-core/video/i386/pc/vga.c
 +++ b/grub-core/video/i386/pc/vga.c
 @@ -127,7 +127,7 @@ grub_video_vga_setup (unsigned int width, unsigned int height,
@@ -1614,7 +1614,7 @@ index 01f47112d..b2f776c99 100644
    framebuffer.back_page = 0;
    if (!framebuffer.temporary_buffer)
 diff --git a/grub-core/video/readers/png.c b/grub-core/video/readers/png.c
-index 777e71334..61bd64537 100644
+index 777e71334c..61bd645379 100644
 --- a/grub-core/video/readers/png.c
 +++ b/grub-core/video/readers/png.c
 @@ -309,7 +309,7 @@ grub_png_decode_image_header (struct grub_png_data *data)
@@ -1627,7 +1627,7 @@ index 777e71334..61bd64537 100644
          return grub_errno;
  
 diff --git a/include/grub/unicode.h b/include/grub/unicode.h
-index a0403e91f..4de986a85 100644
+index a0403e91f9..4de986a857 100644
 --- a/include/grub/unicode.h
 +++ b/include/grub/unicode.h
 @@ -293,7 +293,7 @@ grub_unicode_glyph_dup (const struct grub_unicode_glyph *in)
@@ -1649,7 +1649,7 @@ index a0403e91f..4de986a85 100644
  	return;
        grub_memcpy (out->combining_ptr, in->combining_ptr,
 diff --git a/util/getroot.c b/util/getroot.c
-index cdd41153c..6ae35ecaa 100644
+index cdd41153c5..6ae35ecaa6 100644
 --- a/util/getroot.c
 +++ b/util/getroot.c
 @@ -200,7 +200,7 @@ make_device_name (const char *drive)
@@ -1662,7 +1662,7 @@ index cdd41153c..6ae35ecaa 100644
    for (iptr = drive; *iptr; iptr++)
      {
 diff --git a/util/grub-file.c b/util/grub-file.c
-index 50c18b683..b2e7dd69f 100644
+index 50c18b6835..b2e7dd69f4 100644
 --- a/util/grub-file.c
 +++ b/util/grub-file.c
 @@ -54,7 +54,7 @@ main (int argc, char *argv[])
@@ -1675,7 +1675,7 @@ index 50c18b683..b2e7dd69f 100644
    if (argc == 2 && strcmp (argv[1], "--version") == 0)
      {
 diff --git a/util/grub-fstest.c b/util/grub-fstest.c
-index f14e02d97..57246af7c 100644
+index f14e02d972..57246af7c6 100644
 --- a/util/grub-fstest.c
 +++ b/util/grub-fstest.c
 @@ -650,7 +650,7 @@ argp_parser (int key, char *arg, struct argp_state *state)
@@ -1697,7 +1697,7 @@ index f14e02d97..57246af7c 100644
    argp_parse (&argp, argc, argv, 0, 0, 0);
  
 diff --git a/util/grub-install-common.c b/util/grub-install-common.c
-index fdfe2c7ea..447504d3f 100644
+index fdfe2c7ead..447504d3f4 100644
 --- a/util/grub-install-common.c
 +++ b/util/grub-install-common.c
 @@ -286,7 +286,7 @@ handle_install_list (struct install_list *il, const char *val,
@@ -1710,7 +1710,7 @@ index fdfe2c7ea..447504d3f 100644
    for (ce = il->entries; ; ce++)
      {
 diff --git a/util/grub-install.c b/util/grub-install.c
-index f408b1986..843dfc7c8 100644
+index f408b19860..843dfc7c80 100644
 --- a/util/grub-install.c
 +++ b/util/grub-install.c
 @@ -658,7 +658,7 @@ device_map_check_duplicates (const char *dev_map)
@@ -1732,7 +1732,7 @@ index f408b1986..843dfc7c8 100644
    for (curdev = grub_devices, curdrive = grub_drives; *curdev; curdev++,
         curdrive++)
 diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c
-index bc087c2b5..d97d0e7be 100644
+index bc087c2b57..d97d0e7bef 100644
 --- a/util/grub-mkimagexx.c
 +++ b/util/grub-mkimagexx.c
 @@ -2294,10 +2294,8 @@ SUFFIX (grub_mkimage_load_image) (const char *kernel_path,
@@ -1749,7 +1749,7 @@ index bc087c2b5..d97d0e7be 100644
    SUFFIX (locate_sections) (e, kernel_path, &smd, layout, image_target);
  
 diff --git a/util/grub-mkrescue.c b/util/grub-mkrescue.c
-index 45d6140d3..cb972f120 100644
+index 45d6140d3e..cb972f120b 100644
 --- a/util/grub-mkrescue.c
 +++ b/util/grub-mkrescue.c
 @@ -441,8 +441,8 @@ main (int argc, char *argv[])
@@ -1764,7 +1764,7 @@ index 45d6140d3..cb972f120 100644
    xorriso_tail_argc = 0;
    /* Program name */
 diff --git a/util/grub-mkstandalone.c b/util/grub-mkstandalone.c
-index 4907d44c0..edf309717 100644
+index 4907d44c0b..edf309717c 100644
 --- a/util/grub-mkstandalone.c
 +++ b/util/grub-mkstandalone.c
 @@ -296,7 +296,7 @@ main (int argc, char *argv[])
@@ -1777,7 +1777,7 @@ index 4907d44c0..edf309717 100644
    argp_parse (&argp, argc, argv, 0, 0, 0);
  
 diff --git a/util/grub-pe2elf.c b/util/grub-pe2elf.c
-index 0d4084a10..11331294f 100644
+index 0d4084a108..11331294f1 100644
 --- a/util/grub-pe2elf.c
 +++ b/util/grub-pe2elf.c
 @@ -100,9 +100,9 @@ write_section_data (FILE* fp, const char *name, char *image,
@@ -1817,7 +1817,7 @@ index 0d4084a10..11331294f 100644
    for (i = 0; i < (int) pe_chdr->num_symbols;
         i += pe_symtab->num_aux + 1, pe_symtab += pe_symtab->num_aux + 1)
 diff --git a/util/grub-probe.c b/util/grub-probe.c
-index 81d27eead..cbe6ed94c 100644
+index 81d27eead5..cbe6ed94ca 100644
 --- a/util/grub-probe.c
 +++ b/util/grub-probe.c
 @@ -361,8 +361,8 @@ probe (const char *path, char **device_names, char delim)
diff --git a/debian/patches/0086-malloc-Use-overflow-checking-primitives-where-we-do-.patch b/debian/patches/0085-malloc-Use-overflow-checking-primitives-where-we-do-.patch
 similarity index 95%
 rename from debian/patches/0086-malloc-Use-overflow-checking-primitives-where-we-do-.patch
 rename to debian/patches/0085-malloc-Use-overflow-checking-primitives-where-we-do-.patch
index 95d4c0c..e0bb952 100644
--- a/debian/patches/0086-malloc-Use-overflow-checking-primitives-where-we-do-.patch
+++ b/debian/patches/0085-malloc-Use-overflow-checking-primitives-where-we-do-.patch
@@ -1,4 +1,4 @@
-From 012c6974aaafae101681100dbe7abd5ef55d825d Mon Sep 17 00:00:00 2001
+From 83e59f56362e11618083f376cbf700861d6b8f2a Mon Sep 17 00:00:00 2001
 From: Peter Jones <[e-mail]>
 Date: Mon, 15 Jun 2020 12:28:27 -0400
 Subject: malloc: Use overflow checking primitives where we do complex
@@ -55,7 +55,7 @@ Reviewed-by: Daniel Kiper <[e-mail]>
  23 files changed, 382 insertions(+), 113 deletions(-)
 
 diff --git a/grub-core/commands/legacycfg.c b/grub-core/commands/legacycfg.c
-index 5e3ec0d5e..cc5971f4d 100644
+index 5e3ec0d5e4..cc5971f4db 100644
 --- a/grub-core/commands/legacycfg.c
 +++ b/grub-core/commands/legacycfg.c
 @@ -32,6 +32,7 @@
@@ -118,7 +118,7 @@ index 5e3ec0d5e..cc5971f4d 100644
  		  grub_free (suffix);
  		  return grub_errno;
 diff --git a/grub-core/commands/wildcard.c b/grub-core/commands/wildcard.c
-index 4a106ca04..cc3290311 100644
+index 4a106ca040..cc3290311f 100644
 --- a/grub-core/commands/wildcard.c
 +++ b/grub-core/commands/wildcard.c
 @@ -23,6 +23,7 @@
@@ -220,7 +220,7 @@ index 4a106ca04..cc3290311 100644
        return 1;
      }
 diff --git a/grub-core/disk/ldm.c b/grub-core/disk/ldm.c
-index e6323701a..58f8a53e1 100644
+index e6323701ab..58f8a53e1a 100644
 --- a/grub-core/disk/ldm.c
 +++ b/grub-core/disk/ldm.c
 @@ -25,6 +25,7 @@
@@ -291,7 +291,7 @@ index e6323701a..58f8a53e1 100644
  		    goto fail2;
  		  comp->segments = t;
 diff --git a/grub-core/font/font.c b/grub-core/font/font.c
-index 8e118b315..5edb477ac 100644
+index 8e118b315c..5edb477ac2 100644
 --- a/grub-core/font/font.c
 +++ b/grub-core/font/font.c
 @@ -30,6 +30,7 @@
@@ -318,7 +318,7 @@ index 8e118b315..5edb477ac 100644
      return 0;
  
 diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
-index 11272efc1..2b65bd56a 100644
+index 11272efc1a..2b65bd56a0 100644
 --- a/grub-core/fs/btrfs.c
 +++ b/grub-core/fs/btrfs.c
 @@ -40,6 +40,7 @@
@@ -375,7 +375,7 @@ index 11272efc1..2b65bd56a 100644
  	}
      }
 diff --git a/grub-core/fs/ext2.c b/grub-core/fs/ext2.c
-index 9b389802a..ac33bcd68 100644
+index 9b389802a3..ac33bcd68c 100644
 --- a/grub-core/fs/ext2.c
 +++ b/grub-core/fs/ext2.c
 @@ -46,6 +46,7 @@
@@ -410,7 +410,7 @@ index 9b389802a..ac33bcd68 100644
      return 0;
  
 diff --git a/grub-core/fs/iso9660.c b/grub-core/fs/iso9660.c
-index 4f1b52a55..7ba5b300b 100644
+index 4f1b52a552..7ba5b300bc 100644
 --- a/grub-core/fs/iso9660.c
 +++ b/grub-core/fs/iso9660.c
 @@ -28,6 +28,7 @@
@@ -514,7 +514,7 @@ index 4f1b52a55..7ba5b300b 100644
  		      grub_free (ctx.filename);
  		    grub_free (node);
 diff --git a/grub-core/fs/sfs.c b/grub-core/fs/sfs.c
-index 90f7fb379..de2b107a4 100644
+index 90f7fb3791..de2b107a4a 100644
 --- a/grub-core/fs/sfs.c
 +++ b/grub-core/fs/sfs.c
 @@ -26,6 +26,7 @@
@@ -578,7 +578,7 @@ index 90f7fb379..de2b107a4 100644
  	*grub_latin1_to_utf8 ((grub_uint8_t *) *label,
  			      (const grub_uint8_t *) data->label,
 diff --git a/grub-core/fs/squash4.c b/grub-core/fs/squash4.c
-index 95d5c1e1f..785123894 100644
+index 95d5c1e1ff..785123894e 100644
 --- a/grub-core/fs/squash4.c
 +++ b/grub-core/fs/squash4.c
 @@ -26,6 +26,7 @@
@@ -677,7 +677,7 @@ index 95d5c1e1f..785123894 100644
  	  node->ino = ino;
  	  node->stack[node->stsize].ino_chunk = grub_le_to_cpu32 (dh.ino_chunk);
 diff --git a/grub-core/fs/udf.c b/grub-core/fs/udf.c
-index a83761674..21ac7f446 100644
+index a83761674a..21ac7f4460 100644
 --- a/grub-core/fs/udf.c
 +++ b/grub-core/fs/udf.c
 @@ -28,6 +28,7 @@
@@ -786,7 +786,7 @@ index a83761674..21ac7f446 100644
    grub_free (out);
    grub_error (GRUB_ERR_BAD_FS, "invalid symlink");
 diff --git a/grub-core/fs/xfs.c b/grub-core/fs/xfs.c
-index 96ffecbfc..ea6590290 100644
+index 96ffecbfc9..ea6590290b 100644
 --- a/grub-core/fs/xfs.c
 +++ b/grub-core/fs/xfs.c
 @@ -25,6 +25,7 @@
@@ -822,7 +822,7 @@ index 96ffecbfc..ea6590290 100644
    if (! data)
      goto fail;
 diff --git a/grub-core/fs/zfs/zfs.c b/grub-core/fs/zfs/zfs.c
-index 381dde556..36d0373a6 100644
+index 381dde556d..36d0373a6a 100644
 --- a/grub-core/fs/zfs/zfs.c
 +++ b/grub-core/fs/zfs/zfs.c
 @@ -55,6 +55,7 @@
@@ -875,7 +875,7 @@ index 381dde556..36d0373a6 100644
      return 0;
    grub_memcpy (ret, nvlist, sizeof (grub_uint32_t));
 diff --git a/grub-core/fs/zfs/zfscrypt.c b/grub-core/fs/zfs/zfscrypt.c
-index 1402e0bc2..de3b015f5 100644
+index 1402e0bc29..de3b015f58 100644
 --- a/grub-core/fs/zfs/zfscrypt.c
 +++ b/grub-core/fs/zfs/zfscrypt.c
 @@ -22,6 +22,7 @@
@@ -902,7 +902,7 @@ index 1402e0bc2..de3b015f5 100644
      return grub_errno;
    key->is_passphrase = passphrase;
 diff --git a/grub-core/lib/arg.c b/grub-core/lib/arg.c
-index fd7744a6f..3288609a5 100644
+index fd7744a6ff..3288609a5e 100644
 --- a/grub-core/lib/arg.c
 +++ b/grub-core/lib/arg.c
 @@ -23,6 +23,7 @@
@@ -954,7 +954,7 @@ index fd7744a6f..3288609a5 100644
      return 0;
  
 diff --git a/grub-core/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c
-index 5b9b92d6b..ef0d63afc 100644
+index 5b9b92d6ba..ef0d63afc8 100644
 --- a/grub-core/loader/i386/bsd.c
 +++ b/grub-core/loader/i386/bsd.c
 @@ -35,6 +35,7 @@
@@ -984,7 +984,7 @@ index 5b9b92d6b..ef0d63afc 100644
      return grub_errno;
  
 diff --git a/grub-core/net/dns.c b/grub-core/net/dns.c
-index e332d5eb4..906ec7d67 100644
+index e332d5eb4a..906ec7d678 100644
 --- a/grub-core/net/dns.c
 +++ b/grub-core/net/dns.c
 @@ -22,6 +22,7 @@
@@ -1013,7 +1013,7 @@ index e332d5eb4..906ec7d67 100644
  	return grub_errno;
        dns_servers_alloc = na;
 diff --git a/grub-core/normal/charset.c b/grub-core/normal/charset.c
-index d57fb72fa..4dfcc3107 100644
+index d57fb72faa..4dfcc31078 100644
 --- a/grub-core/normal/charset.c
 +++ b/grub-core/normal/charset.c
 @@ -48,6 +48,7 @@
@@ -1050,7 +1050,7 @@ index d57fb72fa..4dfcc3107 100644
  		  continue;
  		}
 diff --git a/grub-core/normal/cmdline.c b/grub-core/normal/cmdline.c
-index c57242e2e..de03fe63b 100644
+index c57242e2ea..de03fe63b3 100644
 --- a/grub-core/normal/cmdline.c
 +++ b/grub-core/normal/cmdline.c
 @@ -28,6 +28,7 @@
@@ -1086,7 +1086,7 @@ index c57242e2e..de03fe63b 100644
  	  grub_errno = GRUB_ERR_NONE;
  	  (*max_len) /= 2;
 diff --git a/grub-core/normal/menu_entry.c b/grub-core/normal/menu_entry.c
-index 1993995be..50eef918c 100644
+index 1993995be6..50eef918cf 100644
 --- a/grub-core/normal/menu_entry.c
 +++ b/grub-core/normal/menu_entry.c
 @@ -27,6 +27,7 @@
@@ -1119,7 +1119,7 @@ index 1993995be..50eef918c 100644
  
    return 1;
 diff --git a/grub-core/script/argv.c b/grub-core/script/argv.c
-index 217ec5d1e..5751fdd57 100644
+index 217ec5d1e1..5751fdd570 100644
 --- a/grub-core/script/argv.c
 +++ b/grub-core/script/argv.c
 @@ -20,6 +20,7 @@
@@ -1170,7 +1170,7 @@ index 217ec5d1e..5751fdd57 100644
      return 1;
  
 diff --git a/grub-core/script/lexer.c b/grub-core/script/lexer.c
-index c6bd3172f..5fb0cbd0b 100644
+index c6bd3172fa..5fb0cbd0bc 100644
 --- a/grub-core/script/lexer.c
 +++ b/grub-core/script/lexer.c
 @@ -24,6 +24,7 @@
@@ -1231,7 +1231,7 @@ index c6bd3172f..5fb0cbd0b 100644
      }
  
 diff --git a/grub-core/video/bitmap.c b/grub-core/video/bitmap.c
-index b2e031566..6256e209a 100644
+index b2e0315665..6256e209a6 100644
 --- a/grub-core/video/bitmap.c
 +++ b/grub-core/video/bitmap.c
 @@ -23,6 +23,7 @@
@@ -1286,7 +1286,7 @@ index b2e031566..6256e209a 100644
  
  /* Frees all resources allocated by bitmap.  */
 diff --git a/grub-core/video/readers/png.c b/grub-core/video/readers/png.c
-index 61bd64537..0157ff742 100644
+index 61bd645379..0157ff7420 100644
 --- a/grub-core/video/readers/png.c
 +++ b/grub-core/video/readers/png.c
 @@ -23,6 +23,7 @@
diff --git a/debian/patches/0087-iso9660-Don-t-leak-memory-on-realloc-failures.patch b/debian/patches/0086-iso9660-Don-t-leak-memory-on-realloc-failures.patch
 similarity index 96%
 rename from debian/patches/0087-iso9660-Don-t-leak-memory-on-realloc-failures.patch
 rename to debian/patches/0086-iso9660-Don-t-leak-memory-on-realloc-failures.patch
index aa86b39..438d655 100644
--- a/debian/patches/0087-iso9660-Don-t-leak-memory-on-realloc-failures.patch
+++ b/debian/patches/0086-iso9660-Don-t-leak-memory-on-realloc-failures.patch
@@ -1,4 +1,4 @@
-From ae8703a3dd74ec31c8f37135fc32315f926812b2 Mon Sep 17 00:00:00 2001
+From 3daaf33550e0fc35de5a51de337e7d5e4bd1bbfd Mon Sep 17 00:00:00 2001
 From: Peter Jones <[e-mail]>
 Date: Sat, 4 Jul 2020 12:25:09 -0400
 Subject: iso9660: Don't leak memory on realloc() failures
@@ -10,7 +10,7 @@ Reviewed-by: Daniel Kiper <[e-mail]>
  1 file changed, 20 insertions(+), 4 deletions(-)
 
 diff --git a/grub-core/fs/iso9660.c b/grub-core/fs/iso9660.c
-index 7ba5b300b..5ec4433b8 100644
+index 7ba5b300bc..5ec4433b8f 100644
 --- a/grub-core/fs/iso9660.c
 +++ b/grub-core/fs/iso9660.c
 @@ -533,14 +533,20 @@ add_part (struct iterate_dir_ctx *ctx,
diff --git a/debian/patches/0088-font-Do-not-load-more-than-one-NAME-section.patch b/debian/patches/0087-font-Do-not-load-more-than-one-NAME-section.patch
 similarity index 93%
 rename from debian/patches/0088-font-Do-not-load-more-than-one-NAME-section.patch
 rename to debian/patches/0087-font-Do-not-load-more-than-one-NAME-section.patch
index bcabddc..2935ce4 100644
--- a/debian/patches/0088-font-Do-not-load-more-than-one-NAME-section.patch
+++ b/debian/patches/0087-font-Do-not-load-more-than-one-NAME-section.patch
@@ -1,4 +1,4 @@
-From aa83281cfdc2b7a508b8fa21018a3b31e6f0440d Mon Sep 17 00:00:00 2001
+From b762411ec388017c77379629298e90f93dec75d7 Mon Sep 17 00:00:00 2001
 From: Daniel Kiper <[e-mail]>
 Date: Tue, 7 Jul 2020 15:36:26 +0200
 Subject: font: Do not load more than one NAME section
@@ -16,7 +16,7 @@ Reviewed-by: Jan Setje-Eilers <[e-mail]>
  1 file changed, 6 insertions(+)
 
 diff --git a/grub-core/font/font.c b/grub-core/font/font.c
-index 5edb477ac..d09bb38d8 100644
+index 5edb477ac2..d09bb38d89 100644
 --- a/grub-core/font/font.c
 +++ b/grub-core/font/font.c
 @@ -532,6 +532,12 @@ grub_font_load (const char *filename)
diff --git a/debian/patches/0089-gfxmenu-Fix-double-free-in-load_image.patch b/debian/patches/0088-gfxmenu-Fix-double-free-in-load_image.patch
 similarity index 92%
 rename from debian/patches/0089-gfxmenu-Fix-double-free-in-load_image.patch
 rename to debian/patches/0088-gfxmenu-Fix-double-free-in-load_image.patch
index 3808787..dbf1ae4 100644
--- a/debian/patches/0089-gfxmenu-Fix-double-free-in-load_image.patch
+++ b/debian/patches/0088-gfxmenu-Fix-double-free-in-load_image.patch
@@ -1,4 +1,4 @@
-From 72c7f2afab0e9ea5d17b35ea4ff74221e1bcfbfc Mon Sep 17 00:00:00 2001
+From 58e72a15fa61adffe8015da0eb093d2e93380ee0 Mon Sep 17 00:00:00 2001
 From: Alexey Makhalov <[e-mail]>
 Date: Wed, 8 Jul 2020 20:41:56 +0000
 Subject: gfxmenu: Fix double free in load_image()
@@ -15,7 +15,7 @@ Reviewed-by: Daniel Kiper <[e-mail]>
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/grub-core/gfxmenu/gui_image.c b/grub-core/gfxmenu/gui_image.c
-index 29784ed2d..6b2e976f1 100644
+index 29784ed2d9..6b2e976f16 100644
 --- a/grub-core/gfxmenu/gui_image.c
 +++ b/grub-core/gfxmenu/gui_image.c
 @@ -195,7 +195,10 @@ load_image (grub_gui_image_t self, const char *path)
diff --git a/debian/patches/0090-lzma-Make-sure-we-don-t-dereference-past-array.patch b/debian/patches/0089-lzma-Make-sure-we-don-t-dereference-past-array.patch
 similarity index 95%
 rename from debian/patches/0090-lzma-Make-sure-we-don-t-dereference-past-array.patch
 rename to debian/patches/0089-lzma-Make-sure-we-don-t-dereference-past-array.patch
index a6e52ab..eb283a5 100644
--- a/debian/patches/0090-lzma-Make-sure-we-don-t-dereference-past-array.patch
+++ b/debian/patches/0089-lzma-Make-sure-we-don-t-dereference-past-array.patch
@@ -1,4 +1,4 @@
-From c8aef3a92c63add6c4c4b65bbf17c2121d97a688 Mon Sep 17 00:00:00 2001
+From d6f176758a8d2ab9cd81646e7e2e825682a0fdfe Mon Sep 17 00:00:00 2001
 From: Konrad Rzeszutek Wilk <[e-mail]>
 Date: Thu, 9 Jul 2020 03:05:23 +0000
 Subject: lzma: Make sure we don't dereference past array
@@ -21,7 +21,7 @@ Reviewed-by: Daniel Kiper <[e-mail]>
  1 file changed, 8 insertions(+), 2 deletions(-)
 
 diff --git a/grub-core/lib/LzmaEnc.c b/grub-core/lib/LzmaEnc.c
-index f2ec04a8c..753e56a95 100644
+index f2ec04a8c2..753e56a95e 100644
 --- a/grub-core/lib/LzmaEnc.c
 +++ b/grub-core/lib/LzmaEnc.c
 @@ -1877,13 +1877,19 @@ static SRes LzmaEnc_CodeOneBlock(CLzmaEnc *p, Bool useLimits, UInt32 maxPackSize
diff --git a/debian/patches/0091-tftp-Do-not-use-priority-queue.patch b/debian/patches/0090-tftp-Do-not-use-priority-queue.patch
 similarity index 98%
 rename from debian/patches/0091-tftp-Do-not-use-priority-queue.patch
 rename to debian/patches/0090-tftp-Do-not-use-priority-queue.patch
index f679810..df1a56c 100644
--- a/debian/patches/0091-tftp-Do-not-use-priority-queue.patch
+++ b/debian/patches/0090-tftp-Do-not-use-priority-queue.patch
@@ -1,4 +1,4 @@
-From 80e584d2d9a255c7626bac198fb7e335a63a1f51 Mon Sep 17 00:00:00 2001
+From c68bccd83bec72174cfbfb258e7329adb309879d Mon Sep 17 00:00:00 2001
 From: Alexey Makhalov <[e-mail]>
 Date: Thu, 9 Jul 2020 08:10:40 +0000
 Subject: tftp: Do not use priority queue
@@ -34,7 +34,7 @@ Reviewed-by: Daniel Kiper <[e-mail]>
  1 file changed, 53 insertions(+), 118 deletions(-)
 
 diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c
-index a0817a075..e6566fa17 100644
+index a0817a075d..e6566fa176 100644
 --- a/grub-core/net/tftp.c
 +++ b/grub-core/net/tftp.c
 @@ -25,7 +25,6 @@
diff --git a/debian/patches/0092-script-Remove-unused-fields-from-grub_script_functio.patch b/debian/patches/0091-script-Remove-unused-fields-from-grub_script_functio.patch
 similarity index 92%
 rename from debian/patches/0092-script-Remove-unused-fields-from-grub_script_functio.patch
 rename to debian/patches/0091-script-Remove-unused-fields-from-grub_script_functio.patch
index 290af26..4865443 100644
--- a/debian/patches/0092-script-Remove-unused-fields-from-grub_script_functio.patch
+++ b/debian/patches/0091-script-Remove-unused-fields-from-grub_script_functio.patch
@@ -1,4 +1,4 @@
-From d4235881fe9807432c0054149ca07caace83e7cb Mon Sep 17 00:00:00 2001
+From fd60c9a66288bf80f4da18e9832436bf2e6c1e65 Mon Sep 17 00:00:00 2001
 From: Chris Coulson <[e-mail]>
 Date: Fri, 10 Jul 2020 11:21:14 +0100
 Subject: script: Remove unused fields from grub_script_function struct
@@ -10,7 +10,7 @@ Reviewed-by: Daniel Kiper <[e-mail]>
  1 file changed, 5 deletions(-)
 
 diff --git a/include/grub/script_sh.h b/include/grub/script_sh.h
-index 360c2be1f..b382bcf09 100644
+index 360c2be1f0..b382bcf09b 100644
 --- a/include/grub/script_sh.h
 +++ b/include/grub/script_sh.h
 @@ -359,13 +359,8 @@ struct grub_script_function
diff --git a/debian/patches/0093-script-Avoid-a-use-after-free-when-redefining-a-func.patch b/debian/patches/0092-script-Avoid-a-use-after-free-when-redefining-a-func.patch
 similarity index 94%
 rename from debian/patches/0093-script-Avoid-a-use-after-free-when-redefining-a-func.patch
 rename to debian/patches/0092-script-Avoid-a-use-after-free-when-redefining-a-func.patch
index ed02e21..08e4973 100644
--- a/debian/patches/0093-script-Avoid-a-use-after-free-when-redefining-a-func.patch
+++ b/debian/patches/0092-script-Avoid-a-use-after-free-when-redefining-a-func.patch
@@ -1,4 +1,4 @@
-From f7aff9effc6d11719db1cfeef7d3419d635c92f5 Mon Sep 17 00:00:00 2001
+From ce9f66f0a86e6cbfd866e431df87f205537380f5 Mon Sep 17 00:00:00 2001
 From: Chris Coulson <[e-mail]>
 Date: Fri, 10 Jul 2020 14:41:45 +0100
 Subject: script: Avoid a use-after-free when redefining a function during
@@ -27,7 +27,7 @@ Reviewed-by: Daniel Kiper <[e-mail]>
  4 files changed, 19 insertions(+), 4 deletions(-)
 
 diff --git a/grub-core/script/execute.c b/grub-core/script/execute.c
-index c8d6806fe..7e028e135 100644
+index c8d6806fe0..7e028e1355 100644
 --- a/grub-core/script/execute.c
 +++ b/grub-core/script/execute.c
 @@ -838,7 +838,9 @@ grub_script_function_call (grub_script_function_t func, int argc, char **args)
@@ -41,7 +41,7 @@ index c8d6806fe..7e028e135 100644
    function_return = 0;
    active_loops = loops;
 diff --git a/grub-core/script/function.c b/grub-core/script/function.c
-index d36655e51..3aad04bf9 100644
+index d36655e510..3aad04bf9d 100644
 --- a/grub-core/script/function.c
 +++ b/grub-core/script/function.c
 @@ -34,6 +34,7 @@ grub_script_function_create (struct grub_script_arg *functionname_arg,
@@ -76,7 +76,7 @@ index d36655e51..3aad04bf9 100644
    else
      {
 diff --git a/grub-core/script/parser.y b/grub-core/script/parser.y
-index 4f0ab8319..f80b86b6f 100644
+index 4f0ab8319e..f80b86b6f1 100644
 --- a/grub-core/script/parser.y
 +++ b/grub-core/script/parser.y
 @@ -289,7 +289,8 @@ function: "function" "name"
@@ -90,7 +90,7 @@ index 4f0ab8319..f80b86b6f 100644
  
  	    state->scripts = $<scripts>3;
 diff --git a/include/grub/script_sh.h b/include/grub/script_sh.h
-index b382bcf09..6c48e0751 100644
+index b382bcf09b..6c48e07512 100644
 --- a/include/grub/script_sh.h
 +++ b/include/grub/script_sh.h
 @@ -361,6 +361,8 @@ struct grub_script_function
diff --git a/debian/patches/0094-hfsplus-fix-two-more-overflows.patch b/debian/patches/0093-hfsplus-fix-two-more-overflows.patch
 similarity index 95%
 rename from debian/patches/0094-hfsplus-fix-two-more-overflows.patch
 rename to debian/patches/0093-hfsplus-fix-two-more-overflows.patch
index 077e785..cb67208 100644
--- a/debian/patches/0094-hfsplus-fix-two-more-overflows.patch
+++ b/debian/patches/0093-hfsplus-fix-two-more-overflows.patch
@@ -1,4 +1,4 @@
-From f77bef9531eaf93f1f967fda2c7e9c0a16435fa8 Mon Sep 17 00:00:00 2001
+From 4be2c61fdd94238b4e529f018eddea12f6ba5361 Mon Sep 17 00:00:00 2001
 From: Peter Jones <[e-mail]>
 Date: Sun, 19 Jul 2020 14:43:31 -0400
 Subject: hfsplus: fix two more overflows
@@ -15,7 +15,7 @@ Reviewed-by: Darren Kenny <[e-mail]>
  1 file changed, 8 insertions(+), 3 deletions(-)
 
 diff --git a/grub-core/fs/hfsplus.c b/grub-core/fs/hfsplus.c
-index dae43becc..9c4e4c88c 100644
+index dae43becc9..9c4e4c88c9 100644
 --- a/grub-core/fs/hfsplus.c
 +++ b/grub-core/fs/hfsplus.c
 @@ -31,6 +31,7 @@
diff --git a/debian/patches/0095-lvm-fix-two-more-potential-data-dependent-alloc-over.patch b/debian/patches/0094-lvm-fix-two-more-potential-data-dependent-alloc-over.patch
 similarity index 97%
 rename from debian/patches/0095-lvm-fix-two-more-potential-data-dependent-alloc-over.patch
 rename to debian/patches/0094-lvm-fix-two-more-potential-data-dependent-alloc-over.patch
index 5676080..36e67c6 100644
--- a/debian/patches/0095-lvm-fix-two-more-potential-data-dependent-alloc-over.patch
+++ b/debian/patches/0094-lvm-fix-two-more-potential-data-dependent-alloc-over.patch
@@ -1,4 +1,4 @@
-From 9fc5ac5172d7ceae3625258059d9e4b7c8baef76 Mon Sep 17 00:00:00 2001
+From 9082c7d5ed8d9ffb15a12d6bcb10a86ca9c8a860 Mon Sep 17 00:00:00 2001
 From: Peter Jones <[e-mail]>
 Date: Sun, 19 Jul 2020 15:48:20 -0400
 Subject: lvm: fix two more potential data-dependent alloc overflows
@@ -15,7 +15,7 @@ Signed-off-by: Peter Jones <[e-mail]>
  1 file changed, 31 insertions(+), 8 deletions(-)
 
 diff --git a/grub-core/disk/lvm.c b/grub-core/disk/lvm.c
-index d1df640b3..d154f7c01 100644
+index d1df640b31..d154f7c01b 100644
 --- a/grub-core/disk/lvm.c
 +++ b/grub-core/disk/lvm.c
 @@ -25,6 +25,7 @@
diff --git a/debian/patches/0096-efi-fix-some-malformed-device-path-arithmetic-errors.patch b/debian/patches/0095-efi-fix-some-malformed-device-path-arithmetic-errors.patch
 similarity index 97%
 rename from debian/patches/0096-efi-fix-some-malformed-device-path-arithmetic-errors.patch
 rename to debian/patches/0095-efi-fix-some-malformed-device-path-arithmetic-errors.patch
index bbcc5ba..7509a9d 100644
--- a/debian/patches/0096-efi-fix-some-malformed-device-path-arithmetic-errors.patch
+++ b/debian/patches/0095-efi-fix-some-malformed-device-path-arithmetic-errors.patch
@@ -1,4 +1,4 @@
-From 3be69af50aa08c128d570ddf4acd8767115bbb7e Mon Sep 17 00:00:00 2001
+From c9148b4f42091e840b2659504401dab230f7d817 Mon Sep 17 00:00:00 2001
 From: Peter Jones <[e-mail]>
 Date: Sun, 19 Jul 2020 16:53:27 -0400
 Subject: efi: fix some malformed device path arithmetic errors.
@@ -24,7 +24,7 @@ Signed-off-by: Peter Jones <[e-mail]>
  4 files changed, 88 insertions(+), 21 deletions(-)
 
 diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
-index dc31caa21..b1a8b39b4 100644
+index dc31caa213..b1a8b39b49 100644
 --- a/grub-core/kern/efi/efi.c
 +++ b/grub-core/kern/efi/efi.c
 @@ -332,7 +332,7 @@ grub_efi_get_filename (grub_efi_device_path_t *dp0)
@@ -150,7 +150,7 @@ index dc31caa21..b1a8b39b4 100644
    return 0;
  }
 diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
-index b9a2df34b..f8a34cd49 100644
+index b9a2df34b1..f8a34cd491 100644
 --- a/grub-core/loader/efi/chainloader.c
 +++ b/grub-core/loader/efi/chainloader.c
 @@ -126,6 +126,12 @@ copy_file_path (grub_efi_file_path_device_path_t *fp,
@@ -188,7 +188,7 @@ index b9a2df34b..f8a34cd49 100644
  	break;
        d = GRUB_EFI_NEXT_DEVICE_PATH (d);
 diff --git a/grub-core/loader/i386/xnu.c b/grub-core/loader/i386/xnu.c
-index b7d176b5d..c50cb5410 100644
+index b7d176b5d3..c50cb54109 100644
 --- a/grub-core/loader/i386/xnu.c
 +++ b/grub-core/loader/i386/xnu.c
 @@ -516,14 +516,15 @@ grub_cmd_devprop_load (grub_command_t cmd __attribute__ ((unused)),
@@ -212,7 +212,7 @@ index b7d176b5d..c50cb5410 100644
        dev = grub_xnu_devprop_add_device (dpstart, (char *) buf
  					 - (char *) dpstart);
 diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
-index 9824fbcd0..08bff60b5 100644
+index 9824fbcd0d..08bff60b51 100644
 --- a/include/grub/efi/api.h
 +++ b/include/grub/efi/api.h
 @@ -640,6 +640,7 @@ typedef struct grub_efi_device_path grub_efi_device_path_protocol_t;
diff --git a/debian/patches/0097-linuxefi-fail-kernel-validation-without-shim-protoco.patch b/debian/patches/0096-linuxefi-fail-kernel-validation-without-shim-protoco.patch
 similarity index 93%
 rename from debian/patches/0097-linuxefi-fail-kernel-validation-without-shim-protoco.patch
 rename to debian/patches/0096-linuxefi-fail-kernel-validation-without-shim-protoco.patch
index 6c7f6a8..0e0f9e5 100644
--- a/debian/patches/0097-linuxefi-fail-kernel-validation-without-shim-protoco.patch
+++ b/debian/patches/0096-linuxefi-fail-kernel-validation-without-shim-protoco.patch
@@ -1,4 +1,4 @@
-From 67508ab68e6a5be869e049a0e6474f4b717d3ab9 Mon Sep 17 00:00:00 2001
+From a37688a7dd2a14b66aa88005a9473f017aa84d17 Mon Sep 17 00:00:00 2001
 From: Dimitri John Ledkov <[e-mail]>
 Date: Wed, 22 Jul 2020 11:31:43 +0100
 Subject: linuxefi: fail kernel validation without shim protocol.
@@ -20,7 +20,7 @@ Signed-off-by: Dimitri John Ledkov <[e-mail]>
  4 files changed, 12 insertions(+), 5 deletions(-)
 
 diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
-index 1a5296a60..3f5496fc5 100644
+index 1a5296a60c..3f5496fc55 100644
 --- a/grub-core/loader/arm64/linux.c
 +++ b/grub-core/loader/arm64/linux.c
 @@ -34,6 +34,7 @@
@@ -52,7 +52,7 @@ index 1a5296a60..3f5496fc5 100644
  
    cmdline_size = grub_loader_cmdline_size (argc, argv) + sizeof (LINUX_IMAGE);
 diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
-index f8a34cd49..cf89cedf8 100644
+index f8a34cd491..cf89cedf8d 100644
 --- a/grub-core/loader/efi/chainloader.c
 +++ b/grub-core/loader/efi/chainloader.c
 @@ -1096,6 +1096,7 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
@@ -64,7 +64,7 @@ index f8a34cd49..cf89cedf8 100644
    grub_file_close (file);
    grub_device_close (dev);
 diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
-index e372b26a1..f6d30bcf7 100644
+index e372b26a1b..f6d30bcf7c 100644
 --- a/grub-core/loader/efi/linux.c
 +++ b/grub-core/loader/efi/linux.c
 @@ -34,6 +34,7 @@ struct grub_efi_shim_lock
@@ -76,7 +76,7 @@ index e372b26a1..f6d30bcf7 100644
  grub_linuxefi_secure_validate (void *data, grub_uint32_t size)
  {
 diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
-index 2929da7a2..e357bf67c 100644
+index 2929da7a29..e357bf67c6 100644
 --- a/grub-core/loader/i386/efi/linux.c
 +++ b/grub-core/loader/i386/efi/linux.c
 @@ -199,7 +199,7 @@ grub_cmd_linux (grub_command_t cmd __attribute__ ((unused)),
diff --git a/debian/patches/0098-Fix-a-regression-caused-by-efi-fix-some-malformed-de.patch b/debian/patches/0097-Fix-a-regression-caused-by-efi-fix-some-malformed-de.patch
 similarity index 97%
 rename from debian/patches/0098-Fix-a-regression-caused-by-efi-fix-some-malformed-de.patch
 rename to debian/patches/0097-Fix-a-regression-caused-by-efi-fix-some-malformed-de.patch
index d5617f8..fd7f502 100644
--- a/debian/patches/0098-Fix-a-regression-caused-by-efi-fix-some-malformed-de.patch
+++ b/debian/patches/0097-Fix-a-regression-caused-by-efi-fix-some-malformed-de.patch
@@ -1,4 +1,4 @@
-From 1ade4ce46b324418d9b3bcd447470b9a0fea6084 Mon Sep 17 00:00:00 2001
+From 77a41770dfb138bc68c43f86a6e9d05188a0da4f Mon Sep 17 00:00:00 2001
 From: Chris Coulson <[e-mail]>
 Date: Wed, 22 Jul 2020 17:06:04 +0100
 Subject: Fix a regression caused by "efi: fix some malformed device path
@@ -21,7 +21,7 @@ Remove the bogus check, and also propagate errors from copy_file_path.
  1 file changed, 13 insertions(+), 12 deletions(-)
 
 diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
-index cf89cedf8..d0c53077e 100644
+index cf89cedf8d..d0c53077e8 100644
 --- a/grub-core/loader/efi/chainloader.c
 +++ b/grub-core/loader/efi/chainloader.c
 @@ -116,7 +116,7 @@ grub_chainloader_boot (void)
diff --git a/debian/patches/0099-efi-Fix-use-after-free-in-halt-reboot-path.patch b/debian/patches/0098-efi-Fix-use-after-free-in-halt-reboot-path.patch
 similarity index 93%
 rename from debian/patches/0099-efi-Fix-use-after-free-in-halt-reboot-path.patch
 rename to debian/patches/0098-efi-Fix-use-after-free-in-halt-reboot-path.patch
index b083cda..7ea7d7d 100644
--- a/debian/patches/0099-efi-Fix-use-after-free-in-halt-reboot-path.patch
+++ b/debian/patches/0098-efi-Fix-use-after-free-in-halt-reboot-path.patch
@@ -1,4 +1,4 @@
-From 7b06a9d273646247ede44987f8b530a3a445b771 Mon Sep 17 00:00:00 2001
+From 1e7e07cfd5c1caa76479b10e85e6a703d64e0fea Mon Sep 17 00:00:00 2001
 From: Alexey Makhalov <[e-mail]>
 Date: Mon, 20 Jul 2020 23:03:05 +0000
 Subject: efi: Fix use-after-free in halt/reboot path
@@ -52,7 +52,7 @@ Reviewed-by: Darren Kenny <[e-mail]>
  9 files changed, 28 insertions(+), 7 deletions(-)
 
 diff --git a/grub-core/kern/arm/efi/init.c b/grub-core/kern/arm/efi/init.c
-index 06df60e2f..40c3b467f 100644
+index 06df60e2f0..40c3b467fc 100644
 --- a/grub-core/kern/arm/efi/init.c
 +++ b/grub-core/kern/arm/efi/init.c
 @@ -71,4 +71,7 @@ grub_machine_fini (int flags)
@@ -64,7 +64,7 @@ index 06df60e2f..40c3b467f 100644
 +    grub_efi_memory_fini ();
  }
 diff --git a/grub-core/kern/arm64/efi/init.c b/grub-core/kern/arm64/efi/init.c
-index 6224999ec..5010caefd 100644
+index 6224999ec9..5010caefd6 100644
 --- a/grub-core/kern/arm64/efi/init.c
 +++ b/grub-core/kern/arm64/efi/init.c
 @@ -57,4 +57,7 @@ grub_machine_fini (int flags)
@@ -76,7 +76,7 @@ index 6224999ec..5010caefd 100644
 +    grub_efi_memory_fini ();
  }
 diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
-index b1a8b39b4..88bbd34ea 100644
+index b1a8b39b49..88bbd34eac 100644
 --- a/grub-core/kern/efi/efi.c
 +++ b/grub-core/kern/efi/efi.c
 @@ -157,7 +157,8 @@ grub_efi_get_loaded_image (grub_efi_handle_t image_handle)
@@ -90,7 +90,7 @@ index b1a8b39b4..88bbd34ea 100644
                GRUB_EFI_RESET_COLD, GRUB_EFI_SUCCESS, 0, NULL);
    for (;;) ;
 diff --git a/grub-core/kern/efi/init.c b/grub-core/kern/efi/init.c
-index 3dfdf2d22..2c31847bf 100644
+index 3dfdf2d22b..2c31847bf6 100644
 --- a/grub-core/kern/efi/init.c
 +++ b/grub-core/kern/efi/init.c
 @@ -80,5 +80,4 @@ grub_efi_fini (void)
@@ -100,7 +100,7 @@ index 3dfdf2d22..2c31847bf 100644
 -  grub_efi_memory_fini ();
  }
 diff --git a/grub-core/kern/i386/efi/init.c b/grub-core/kern/i386/efi/init.c
-index da499aba0..deb2eacd8 100644
+index da499aba04..deb2eacd8d 100644
 --- a/grub-core/kern/i386/efi/init.c
 +++ b/grub-core/kern/i386/efi/init.c
 @@ -39,6 +39,11 @@ grub_machine_init (void)
@@ -118,7 +118,7 @@ index da499aba0..deb2eacd8 100644
 +    grub_efi_memory_fini ();
  }
 diff --git a/grub-core/kern/ia64/efi/init.c b/grub-core/kern/ia64/efi/init.c
-index b5ecbd091..f1965571b 100644
+index b5ecbd0912..f1965571b1 100644
 --- a/grub-core/kern/ia64/efi/init.c
 +++ b/grub-core/kern/ia64/efi/init.c
 @@ -70,6 +70,11 @@ grub_machine_init (void)
@@ -136,7 +136,7 @@ index b5ecbd091..f1965571b 100644
 +    grub_efi_memory_fini ();
  }
 diff --git a/grub-core/kern/riscv/efi/init.c b/grub-core/kern/riscv/efi/init.c
-index 7eb1969d0..38795fe67 100644
+index 7eb1969d0b..38795fe674 100644
 --- a/grub-core/kern/riscv/efi/init.c
 +++ b/grub-core/kern/riscv/efi/init.c
 @@ -73,4 +73,7 @@ grub_machine_fini (int flags)
@@ -148,7 +148,7 @@ index 7eb1969d0..38795fe67 100644
 +    grub_efi_memory_fini ();
  }
 diff --git a/grub-core/lib/efi/halt.c b/grub-core/lib/efi/halt.c
-index 5859f0498..29d413641 100644
+index 5859f0498a..29d4136416 100644
 --- a/grub-core/lib/efi/halt.c
 +++ b/grub-core/lib/efi/halt.c
 @@ -28,7 +28,8 @@
@@ -162,7 +162,7 @@ index 5859f0498..29d413641 100644
      !defined(__riscv)
    grub_acpi_halt ();
 diff --git a/include/grub/loader.h b/include/grub/loader.h
-index 7f82a499f..b20864282 100644
+index 7f82a499fd..b208642821 100644
 --- a/include/grub/loader.h
 +++ b/include/grub/loader.h
 @@ -33,6 +33,7 @@ enum
diff --git a/debian/patches/0100-chainloader-Avoid-a-double-free-when-validation-fail.patch b/debian/patches/0099-chainloader-Avoid-a-double-free-when-validation-fail.patch
 similarity index 95%
 rename from debian/patches/0100-chainloader-Avoid-a-double-free-when-validation-fail.patch
 rename to debian/patches/0099-chainloader-Avoid-a-double-free-when-validation-fail.patch
index 70bd726..42d6ff3 100644
--- a/debian/patches/0100-chainloader-Avoid-a-double-free-when-validation-fail.patch
+++ b/debian/patches/0099-chainloader-Avoid-a-double-free-when-validation-fail.patch
@@ -1,4 +1,4 @@
-From 52538e3d0bf20717e89713c6cabc54e227659884 Mon Sep 17 00:00:00 2001
+From 06a88955852ba3c301f3a37c99faa813bd7262c8 Mon Sep 17 00:00:00 2001
 From: Chris Coulson <[e-mail]>
 Date: Thu, 23 Jul 2020 14:02:17 +0100
 Subject: chainloader: Avoid a double free when validation fails
@@ -8,7 +8,7 @@ Subject: chainloader: Avoid a double free when validation fails
  1 file changed, 6 insertions(+), 3 deletions(-)
 
 diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
-index d0c53077e..144a6549d 100644
+index d0c53077e8..144a6549df 100644
 --- a/grub-core/loader/efi/chainloader.c
 +++ b/grub-core/loader/efi/chainloader.c
 @@ -1085,6 +1085,9 @@ grub_cmd_chainloader (grub_command_t cmd __attribute__ ((unused)),
diff --git a/debian/patches/0101-relocator-Protect-grub_relocator_alloc_chunk_addr-in.patch b/debian/patches/0100-relocator-Protect-grub_relocator_alloc_chunk_addr-in.patch
 similarity index 96%
 rename from debian/patches/0101-relocator-Protect-grub_relocator_alloc_chunk_addr-in.patch
 rename to debian/patches/0100-relocator-Protect-grub_relocator_alloc_chunk_addr-in.patch
index 780dcf8..34464ab 100644
--- a/debian/patches/0101-relocator-Protect-grub_relocator_alloc_chunk_addr-in.patch
+++ b/debian/patches/0100-relocator-Protect-grub_relocator_alloc_chunk_addr-in.patch
@@ -1,4 +1,4 @@
-From e4356ccb73aa1d54d319999de4ce46e2e1f79b59 Mon Sep 17 00:00:00 2001
+From d1e511e940a1f2577f568e11076df02c7a221042 Mon Sep 17 00:00:00 2001
 From: Alexey Makhalov <[e-mail]>
 Date: Wed, 15 Jul 2020 06:42:37 +0000
 Subject: relocator: Protect grub_relocator_alloc_chunk_addr() input args
@@ -19,7 +19,7 @@ Reviewed-by: Daniel Kiper <[e-mail]>
  4 files changed, 31 insertions(+), 10 deletions(-)
 
 diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
-index 991eb29db..4e14eb188 100644
+index 991eb29db9..4e14eb1887 100644
 --- a/grub-core/loader/i386/linux.c
 +++ b/grub-core/loader/i386/linux.c
 @@ -36,6 +36,7 @@
@@ -47,7 +47,7 @@ index 991eb29db..4e14eb188 100644
       return err;
      real_mode_mem = get_virtual_current_address (ch);
 diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c
-index 3866f048b..81ab3c0c1 100644
+index 3866f048bb..81ab3c0c15 100644
 --- a/grub-core/loader/i386/pc/linux.c
 +++ b/grub-core/loader/i386/pc/linux.c
 @@ -36,6 +36,7 @@
@@ -74,7 +74,7 @@ index 3866f048b..81ab3c0c1 100644
    if (! grub_linux_is_bzimage
        && GRUB_LINUX_ZIMAGE_ADDR + grub_linux16_prot_size
 diff --git a/grub-core/loader/i386/xen.c b/grub-core/loader/i386/xen.c
-index 8f662c8ac..cd24874ca 100644
+index 8f662c8ac8..cd24874ca3 100644
 --- a/grub-core/loader/i386/xen.c
 +++ b/grub-core/loader/i386/xen.c
 @@ -41,6 +41,7 @@
@@ -111,7 +111,7 @@ index 8f662c8ac..cd24874ca 100644
      goto fail;
    kern_chunk_src = get_virtual_current_address (ch);
 diff --git a/grub-core/loader/xnu.c b/grub-core/loader/xnu.c
-index 2f0ebd0b8..3fd653993 100644
+index 2f0ebd0b8b..3fd653993f 100644
 --- a/grub-core/loader/xnu.c
 +++ b/grub-core/loader/xnu.c
 @@ -35,6 +35,7 @@
diff --git a/debian/patches/0102-relocator-Protect-grub_relocator_alloc_chunk_align-m.patch b/debian/patches/0101-relocator-Protect-grub_relocator_alloc_chunk_align-m.patch
 similarity index 92%
 rename from debian/patches/0102-relocator-Protect-grub_relocator_alloc_chunk_align-m.patch
 rename to debian/patches/0101-relocator-Protect-grub_relocator_alloc_chunk_align-m.patch
index 4cdc4fc..5f955e5 100644
--- a/debian/patches/0102-relocator-Protect-grub_relocator_alloc_chunk_align-m.patch
+++ b/debian/patches/0101-relocator-Protect-grub_relocator_alloc_chunk_align-m.patch
@@ -1,4 +1,4 @@
-From a55ad29707df6f2898852118272c455b43c82b98 Mon Sep 17 00:00:00 2001
+From 91276109ad6be0700b9fee507063f01df0692070 Mon Sep 17 00:00:00 2001
 From: Alexey Makhalov <[e-mail]>
 Date: Wed, 8 Jul 2020 01:44:38 +0000
 Subject: relocator: Protect grub_relocator_alloc_chunk_align() max_addr
@@ -35,7 +35,7 @@ Reviewed-by: Daniel Kiper <[e-mail]>
  13 files changed, 69 insertions(+), 58 deletions(-)
 
 diff --git a/grub-core/lib/i386/relocator.c b/grub-core/lib/i386/relocator.c
-index 71dd4f0ab..34cbe834f 100644
+index 71dd4f0ab0..34cbe834fa 100644
 --- a/grub-core/lib/i386/relocator.c
 +++ b/grub-core/lib/i386/relocator.c
 @@ -83,11 +83,10 @@ grub_relocator32_boot (struct grub_relocator *rel,
@@ -88,7 +88,7 @@ index 71dd4f0ab..34cbe834f 100644
      return err;
  
 diff --git a/grub-core/lib/mips/relocator.c b/grub-core/lib/mips/relocator.c
-index 9d5f49cb9..743b213e6 100644
+index 9d5f49cb93..743b213e69 100644
 --- a/grub-core/lib/mips/relocator.c
 +++ b/grub-core/lib/mips/relocator.c
 @@ -120,10 +120,8 @@ grub_relocator32_boot (struct grub_relocator *rel,
@@ -105,7 +105,7 @@ index 9d5f49cb9..743b213e6 100644
    if (err)
      return err;
 diff --git a/grub-core/lib/powerpc/relocator.c b/grub-core/lib/powerpc/relocator.c
-index bdf2b111b..8ffb8b686 100644
+index bdf2b111be..8ffb8b6868 100644
 --- a/grub-core/lib/powerpc/relocator.c
 +++ b/grub-core/lib/powerpc/relocator.c
 @@ -115,10 +115,8 @@ grub_relocator32_boot (struct grub_relocator *rel,
@@ -122,7 +122,7 @@ index bdf2b111b..8ffb8b686 100644
    if (err)
      return err;
 diff --git a/grub-core/lib/x86_64/efi/relocator.c b/grub-core/lib/x86_64/efi/relocator.c
-index 3caef7a40..7d200a125 100644
+index 3caef7a402..7d200a125e 100644
 --- a/grub-core/lib/x86_64/efi/relocator.c
 +++ b/grub-core/lib/x86_64/efi/relocator.c
 @@ -50,10 +50,9 @@ grub_relocator64_efi_boot (struct grub_relocator *rel,
@@ -140,7 +140,7 @@ index 3caef7a40..7d200a125 100644
      return err;
  
 diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
-index 4e14eb188..04bd78a1f 100644
+index 4e14eb1887..04bd78a1fa 100644
 --- a/grub-core/loader/i386/linux.c
 +++ b/grub-core/loader/i386/linux.c
 @@ -184,9 +184,8 @@ allocate_pages (grub_size_t prot_size, grub_size_t *align,
@@ -156,7 +156,7 @@ index 4e14eb188..04bd78a1f 100644
  						    GRUB_RELOCATOR_PREFERENCE_LOW,
  						    1);
 diff --git a/grub-core/loader/i386/multiboot_mbi.c b/grub-core/loader/i386/multiboot_mbi.c
-index ad3cc292f..a67d9d0a8 100644
+index ad3cc292fd..a67d9d0a80 100644
 --- a/grub-core/loader/i386/multiboot_mbi.c
 +++ b/grub-core/loader/i386/multiboot_mbi.c
 @@ -466,10 +466,9 @@ grub_multiboot_make_mbi (grub_uint32_t *target)
@@ -174,7 +174,7 @@ index ad3cc292f..a67d9d0a8 100644
      return err;
    ptrorig = get_virtual_current_address (ch);
 diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c
-index 81ab3c0c1..6400a5b91 100644
+index 81ab3c0c15..6400a5b91d 100644
 --- a/grub-core/loader/i386/pc/linux.c
 +++ b/grub-core/loader/i386/pc/linux.c
 @@ -463,10 +463,8 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
@@ -191,7 +191,7 @@ index 81ab3c0c1..6400a5b91 100644
        return err;
      initrd_chunk = get_virtual_current_address (ch);
 diff --git a/grub-core/loader/mips/linux.c b/grub-core/loader/mips/linux.c
-index 7b723bf18..e4ed95921 100644
+index 7b723bf189..e4ed95921d 100644
 --- a/grub-core/loader/mips/linux.c
 +++ b/grub-core/loader/mips/linux.c
 @@ -442,12 +442,9 @@ grub_cmd_initrd (grub_command_t cmd __attribute__ ((unused)),
@@ -211,7 +211,7 @@ index 7b723bf18..e4ed95921 100644
      if (err)
        goto fail;
 diff --git a/grub-core/loader/multiboot.c b/grub-core/loader/multiboot.c
-index 3e6ad166d..3e286908d 100644
+index 3e6ad166dc..3e286908dd 100644
 --- a/grub-core/loader/multiboot.c
 +++ b/grub-core/loader/multiboot.c
 @@ -404,7 +404,7 @@ grub_cmd_module (grub_command_t cmd __attribute__ ((unused)),
@@ -224,7 +224,7 @@ index 3e6ad166d..3e286908d 100644
  					    GRUB_RELOCATOR_PREFERENCE_NONE, 1);
      if (err)
 diff --git a/grub-core/loader/multiboot_elfxx.c b/grub-core/loader/multiboot_elfxx.c
-index cc6853692..f2318e0d1 100644
+index cc6853692a..f2318e0d16 100644
 --- a/grub-core/loader/multiboot_elfxx.c
 +++ b/grub-core/loader/multiboot_elfxx.c
 @@ -109,10 +109,10 @@ CONCAT(grub_multiboot_load_elf, XX) (mbi_load_data_t *mld)
@@ -252,7 +252,7 @@ index cc6853692..f2318e0d1 100644
  						  GRUB_RELOCATOR_PREFERENCE_NONE,
  						  mld->avoid_efi_boot_services);
 diff --git a/grub-core/loader/multiboot_mbi2.c b/grub-core/loader/multiboot_mbi2.c
-index 53da78615..3ec209283 100644
+index 53da786151..3ec2092839 100644
 --- a/grub-core/loader/multiboot_mbi2.c
 +++ b/grub-core/loader/multiboot_mbi2.c
 @@ -295,10 +295,10 @@ grub_multiboot2_load (grub_file_t file, const char *filename)
@@ -280,7 +280,7 @@ index 53da78615..3ec209283 100644
  					  GRUB_RELOCATOR_PREFERENCE_NONE, 1);
    if (err)
 diff --git a/grub-core/loader/xnu_resume.c b/grub-core/loader/xnu_resume.c
-index 8089804d4..d648ef0cd 100644
+index 8089804d48..d648ef0cd3 100644
 --- a/grub-core/loader/xnu_resume.c
 +++ b/grub-core/loader/xnu_resume.c
 @@ -129,7 +129,7 @@ grub_xnu_resume (char *imagename)
@@ -293,7 +293,7 @@ index 8089804d4..d648ef0cd 100644
  					    GRUB_XNU_PAGESIZE,
  					    GRUB_RELOCATOR_PREFERENCE_NONE, 0);
 diff --git a/include/grub/relocator.h b/include/grub/relocator.h
-index 24d8672d2..1b3bdd92a 100644
+index 24d8672d22..1b3bdd92ac 100644
 --- a/include/grub/relocator.h
 +++ b/include/grub/relocator.h
 @@ -49,6 +49,35 @@ grub_relocator_alloc_chunk_align (struct grub_relocator *rel,
diff --git a/debian/patches/0103-relocator-Fix-grub_relocator_alloc_chunk_align-top-m.patch b/debian/patches/0102-relocator-Fix-grub_relocator_alloc_chunk_align-top-m.patch
 similarity index 94%
 rename from debian/patches/0103-relocator-Fix-grub_relocator_alloc_chunk_align-top-m.patch
 rename to debian/patches/0102-relocator-Fix-grub_relocator_alloc_chunk_align-top-m.patch
index 7291719..a4d7edd 100644
--- a/debian/patches/0103-relocator-Fix-grub_relocator_alloc_chunk_align-top-m.patch
+++ b/debian/patches/0102-relocator-Fix-grub_relocator_alloc_chunk_align-top-m.patch
@@ -1,4 +1,4 @@
-From 04b3402c6b1acca2dbc6918e2a24185701a13391 Mon Sep 17 00:00:00 2001
+From f5102243ac5d0cc9a319b2f5c4cbc2c518d0d137 Mon Sep 17 00:00:00 2001
 From: Alexey Makhalov <[e-mail]>
 Date: Fri, 17 Jul 2020 05:17:26 +0000
 Subject: relocator: Fix grub_relocator_alloc_chunk_align() top memory
@@ -26,7 +26,7 @@ Reviewed-by: Daniel Kiper <[e-mail]>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/grub-core/lib/relocator.c b/grub-core/lib/relocator.c
-index 5847aac36..f2c1944c2 100644
+index 5847aac364..f2c1944c28 100644
 --- a/grub-core/lib/relocator.c
 +++ b/grub-core/lib/relocator.c
 @@ -1386,8 +1386,8 @@ grub_relocator_alloc_chunk_align (struct grub_relocator *rel,
diff --git a/debian/patches/0104-linux-loader-avoid-overflow-on-initrd-size-calculati.patch b/debian/patches/0103-linux-loader-avoid-overflow-on-initrd-size-calculati.patch
 similarity index 90%
 rename from debian/patches/0104-linux-loader-avoid-overflow-on-initrd-size-calculati.patch
 rename to debian/patches/0103-linux-loader-avoid-overflow-on-initrd-size-calculati.patch
index c3f2378..0bf8d98 100644
--- a/debian/patches/0104-linux-loader-avoid-overflow-on-initrd-size-calculati.patch
+++ b/debian/patches/0103-linux-loader-avoid-overflow-on-initrd-size-calculati.patch
@@ -1,4 +1,4 @@
-From b47e1a6cb4d32f04bf3df4d3a8617408264c4de4 Mon Sep 17 00:00:00 2001
+From 3390bca8bde1f29b8d449f28d5a1fa4f08598af8 Mon Sep 17 00:00:00 2001
 From: Peter Jones <[e-mail]>
 Date: Fri, 24 Jul 2020 13:57:27 -0400
 Subject: linux loader: avoid overflow on initrd size calculation
@@ -9,7 +9,7 @@ Signed-off-by: Peter Jones <[e-mail]>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/grub-core/loader/linux.c b/grub-core/loader/linux.c
-index 471b214d6..25624ebc1 100644
+index 471b214d6c..25624ebc11 100644
 --- a/grub-core/loader/linux.c
 +++ b/grub-core/loader/linux.c
 @@ -151,8 +151,8 @@ grub_initrd_init (int argc, char *argv[],
diff --git a/debian/patches/0105-linux-Fix-integer-overflows-in-initrd-size-handling.patch b/debian/patches/0104-linux-Fix-integer-overflows-in-initrd-size-handling.patch
 similarity index 99%
 rename from debian/patches/0105-linux-Fix-integer-overflows-in-initrd-size-handling.patch
 rename to debian/patches/0104-linux-Fix-integer-overflows-in-initrd-size-handling.patch
index b0ead6d..e7c41b2 100644
--- a/debian/patches/0105-linux-Fix-integer-overflows-in-initrd-size-handling.patch
+++ b/debian/patches/0104-linux-Fix-integer-overflows-in-initrd-size-handling.patch
@@ -1,4 +1,4 @@
-From 33b27a7c9ec994dd1a4f4391df9ac3a61807aa00 Mon Sep 17 00:00:00 2001
+From 5ae3595759c09e23b48fa2bb35abbe1f66c529bc Mon Sep 17 00:00:00 2001
 From: Colin Watson <[e-mail]>
 Date: Sat, 25 Jul 2020 12:15:37 +0100
 Subject: linux: Fix integer overflows in initrd size handling
@@ -14,7 +14,7 @@ Reviewed-by: Jan Setje-Eilers <[e-mail]>
  1 file changed, 54 insertions(+), 20 deletions(-)
 
 diff --git a/grub-core/loader/linux.c b/grub-core/loader/linux.c
-index 25624ebc1..e9f819ee9 100644
+index 25624ebc11..e9f819ee95 100644
 --- a/grub-core/loader/linux.c
 +++ b/grub-core/loader/linux.c
 @@ -4,6 +4,7 @@
diff --git a/debian/patches/0106-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch b/debian/patches/0105-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch
 similarity index 95%
 rename from debian/patches/0106-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch
 rename to debian/patches/0105-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch
index c19a4e3..c364981 100644
--- a/debian/patches/0106-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch
+++ b/debian/patches/0105-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch
@@ -1,4 +1,4 @@
-From ec83738b990d5008c23fa820edbfd9580df95e51 Mon Sep 17 00:00:00 2001
+From c15dfc896951a0d1fa03576a3354c59a873cb019 Mon Sep 17 00:00:00 2001
 From: Colin Watson <[e-mail]>
 Date: Mon, 27 Jul 2020 14:22:12 +0100
 Subject: efilinux: Fix integer overflows in grub_cmd_initrd
@@ -15,7 +15,7 @@ Signed-off-by: Colin Watson <[e-mail]>
  1 file changed, 7 insertions(+), 2 deletions(-)
 
 diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
-index e357bf67c..381459ce0 100644
+index e357bf67c6..381459ce08 100644
 --- a/grub-core/loader/i386/efi/linux.c
 +++ b/grub-core/loader/i386/efi/linux.c
 @@ -28,6 +28,7 @@
diff --git a/debian/patches/at_keyboard-module-init.patch b/debian/patches/at_keyboard-module-init.patch
index faafb46..fe36d6e 100644
--- a/debian/patches/at_keyboard-module-init.patch
+++ b/debian/patches/at_keyboard-module-init.patch
@@ -1,4 +1,4 @@
-From 2fa183df8ec4037976444a92810672b0fa3f75b4 Mon Sep 17 00:00:00 2001
+From 5365f46e0c28babd3ec09fa2c665b946ac9b3d0f Mon Sep 17 00:00:00 2001
 From: Jeroen Dekkers <[e-mail]>
 Date: Sat, 12 Jan 2019 21:02:18 +0100
 Subject: at_keyboard: initialize keyboard in module init if keyboard is ready
@@ -16,7 +16,7 @@ Patch-Name: at_keyboard-module-init.patch
  1 file changed, 9 insertions(+)
 
 diff --git a/grub-core/term/at_keyboard.c b/grub-core/term/at_keyboard.c
-index f0a986eb1..d4395c201 100644
+index f0a986eb17..d4395c2019 100644
 --- a/grub-core/term/at_keyboard.c
 +++ b/grub-core/term/at_keyboard.c
 @@ -244,6 +244,14 @@ grub_at_keyboard_getkey (struct grub_term_input *term __attribute__ ((unused)))
diff --git a/debian/patches/bash-completion-drop-have-checks.patch b/debian/patches/bash-completion-drop-have-checks.patch
index acb2021..806cf54 100644
--- a/debian/patches/bash-completion-drop-have-checks.patch
+++ b/debian/patches/bash-completion-drop-have-checks.patch
@@ -1,4 +1,4 @@
-From 1eee32e5a695ce788c97203f0fba724bf5dc3a19 Mon Sep 17 00:00:00 2001
+From c3bac3061438a6308dc0191e72e295957270c755 Mon Sep 17 00:00:00 2001
 From: Colin Watson <[e-mail]>
 Date: Fri, 16 Nov 2018 16:37:02 +0000
 Subject: bash-completion: Drop "have" checks
@@ -16,7 +16,7 @@ Patch-Name: bash-completion-drop-have-checks.patch
  1 file changed, 13 insertions(+), 26 deletions(-)
 
 diff --git a/util/bash-completion.d/grub-completion.bash.in b/util/bash-completion.d/grub-completion.bash.in
-index 44bf135b9..d4235e7ef 100644
+index 44bf135b9f..d4235e7ef8 100644
 --- a/util/bash-completion.d/grub-completion.bash.in
 +++ b/util/bash-completion.d/grub-completion.bash.in
 @@ -166,13 +166,11 @@ _grub_set_entry () {
diff --git a/debian/patches/blacklist-1440x900x32.patch b/debian/patches/blacklist-1440x900x32.patch
index 5043cf4..432726d 100644
--- a/debian/patches/blacklist-1440x900x32.patch
+++ b/debian/patches/blacklist-1440x900x32.patch
@@ -1,4 +1,4 @@
-From a7d121953a5158ccd4e8789a475cd43b83c2b779 Mon Sep 17 00:00:00 2001
+From a48eec06d4c5c5d1e808b52c1193044c09d638c2 Mon Sep 17 00:00:00 2001
 From: Colin Watson <[e-mail]>
 Date: Mon, 13 Jan 2014 12:13:11 +0000
 Subject: Blacklist 1440x900x32 from VBE preferred mode handling
@@ -13,7 +13,7 @@ Patch-Name: blacklist-1440x900x32.patch
  1 file changed, 9 insertions(+)
 
 diff --git a/grub-core/video/i386/pc/vbe.c b/grub-core/video/i386/pc/vbe.c
-index b7f911926..4b1bd7d5e 100644
+index b7f911926d..4b1bd7d5ea 100644
 --- a/grub-core/video/i386/pc/vbe.c
 +++ b/grub-core/video/i386/pc/vbe.c
 @@ -1054,6 +1054,15 @@ grub_video_vbe_setup (unsigned int width, unsigned int height,
diff --git a/debian/patches/bootp-new-net_bootp6-command.patch b/debian/patches/bootp-new-net_bootp6-command.patch
index d53a2f2..67f690b 100644
--- a/debian/patches/bootp-new-net_bootp6-command.patch
+++ b/debian/patches/bootp-new-net_bootp6-command.patch
@@ -1,4 +1,4 @@
-From 8624974d81aaa8eabd6328c99ec5c7d204c80638 Mon Sep 17 00:00:00 2001
+From c5375c14deee6e8fd23a018d583495e5c4f95930 Mon Sep 17 00:00:00 2001
 From: Michael Chang <[e-mail]>
 Date: Thu, 27 Oct 2016 17:41:04 -0400
 Subject: bootp: New net_bootp6 command
@@ -17,7 +17,7 @@ Patch-Name: bootp-new-net_bootp6-command.patch
  3 files changed, 1018 insertions(+), 1 deletion(-)
 
 diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
-index 04cfbb045..21c1824ef 100644
+index 04cfbb0450..21c1824efb 100644
 --- a/grub-core/net/bootp.c
 +++ b/grub-core/net/bootp.c
 @@ -24,6 +24,98 @@
@@ -969,7 +969,7 @@ index 04cfbb045..21c1824ef 100644
 +  grub_unregister_command (cmd_bootp6);
  }
 diff --git a/grub-core/net/ip.c b/grub-core/net/ip.c
-index ea5edf8f1..01410798b 100644
+index ea5edf8f1f..01410798b3 100644
 --- a/grub-core/net/ip.c
 +++ b/grub-core/net/ip.c
 @@ -239,6 +239,45 @@ handle_dgram (struct grub_net_buff *nb,
@@ -1019,7 +1019,7 @@ index ea5edf8f1..01410798b 100644
        {
  	const struct grub_net_bootp_packet *bootp;
 diff --git a/include/grub/net.h b/include/grub/net.h
-index cc114286e..58cff96d2 100644
+index cc114286ea..58cff96d2a 100644
 --- a/include/grub/net.h
 +++ b/include/grub/net.h
 @@ -448,6 +448,66 @@ struct grub_net_bootp_packet
diff --git a/debian/patches/bootp-process-dhcpack-http-boot.patch b/debian/patches/bootp-process-dhcpack-http-boot.patch
index 74e9508..aabd41a 100644
--- a/debian/patches/bootp-process-dhcpack-http-boot.patch
+++ b/debian/patches/bootp-process-dhcpack-http-boot.patch
@@ -1,4 +1,4 @@
-From 3de9845e404a99dc3122efbf7c2570482097c412 Mon Sep 17 00:00:00 2001
+From 6e1e440798cf53f89f0e5a177d781f0b3d4bc1ca Mon Sep 17 00:00:00 2001
 From: Michael Chang <[e-mail]>
 Date: Thu, 27 Oct 2016 17:42:19 -0400
 Subject: bootp: Add processing DHCPACK packet from HTTP Boot
@@ -24,7 +24,7 @@ Patch-Name: bootp-process-dhcpack-http-boot.patch
  2 files changed, 60 insertions(+), 1 deletion(-)
 
 diff --git a/grub-core/net/bootp.c b/grub-core/net/bootp.c
-index 21c1824ef..558d97ba1 100644
+index 21c1824efb..558d97ba1e 100644
 --- a/grub-core/net/bootp.c
 +++ b/grub-core/net/bootp.c
 @@ -154,7 +154,7 @@ struct grub_dhcp_request_options
@@ -109,7 +109,7 @@ index 21c1824ef..558d97ba1 100644
        },
        GRUB_NET_BOOTP_END,
 diff --git a/include/grub/net.h b/include/grub/net.h
-index 58cff96d2..b5f9e617e 100644
+index 58cff96d2a..b5f9e617e5 100644
 --- a/include/grub/net.h
 +++ b/include/grub/net.h
 @@ -523,6 +523,7 @@ enum
diff --git a/debian/patches/cherrypick-lsefisystab-define-smbios3.patch b/debian/patches/cherrypick-lsefisystab-define-smbios3.patch
index 612fc32..48619ef 100644
--- a/debian/patches/cherrypick-lsefisystab-define-smbios3.patch
+++ b/debian/patches/cherrypick-lsefisystab-define-smbios3.patch
@@ -1,4 +1,4 @@
-From 0bc1e64554d9dfbcfaf5e384fcb772f861a548d8 Mon Sep 17 00:00:00 2001
+From 7a7aa7f7da952420277726d4e2279716d1738aa6 Mon Sep 17 00:00:00 2001
 From: David Michael <[e-mail]>
 Date: Fri, 5 Jul 2019 08:47:02 -0400
 Subject: lsefisystab: Define SMBIOS3 entry point structures for EFI
@@ -16,7 +16,7 @@ Patch-Name: cherrypick-lsefisystab-define-smbios3.patch
  2 files changed, 6 insertions(+)
 
 diff --git a/grub-core/commands/efi/lsefisystab.c b/grub-core/commands/efi/lsefisystab.c
-index df1030221..7c039c509 100644
+index df10302218..7c039c5097 100644
 --- a/grub-core/commands/efi/lsefisystab.c
 +++ b/grub-core/commands/efi/lsefisystab.c
 @@ -48,6 +48,7 @@ static const struct guid_mapping guid_mappings[] =
@@ -28,7 +28,7 @@ index df1030221..7c039c509 100644
      { GRUB_EFI_TIANO_CUSTOM_DECOMPRESS_GUID, "TIANO CUSTOM DECOMPRESS"},
      { GRUB_EFI_TSC_FREQUENCY_GUID, "TSC FREQUENCY"},
 diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
-index 75befd10e..9824fbcd0 100644
+index 75befd10e5..9824fbcd0d 100644
 --- a/include/grub/efi/api.h
 +++ b/include/grub/efi/api.h
 @@ -314,6 +314,11 @@
diff --git a/debian/patches/cherrypick-lsefisystab-show-dtb.patch b/debian/patches/cherrypick-lsefisystab-show-dtb.patch
index 6516840..727628f 100644
--- a/debian/patches/cherrypick-lsefisystab-show-dtb.patch
+++ b/debian/patches/cherrypick-lsefisystab-show-dtb.patch
@@ -1,4 +1,4 @@
-From b5a07214b83812f0b8b42dc576021e98237498e6 Mon Sep 17 00:00:00 2001
+From b67cba441eece77123d08105d447128e09593194 Mon Sep 17 00:00:00 2001
 From: Heinrich Schuchardt <[e-mail]>
 Date: Sat, 6 Jul 2019 11:11:02 +0200
 Subject: lsefisystab: Add support for device tree table
@@ -27,7 +27,7 @@ Patch-Name: cherrypick-lsefisystab-show-dtb.patch
  1 file changed, 1 insertion(+)
 
 diff --git a/grub-core/commands/efi/lsefisystab.c b/grub-core/commands/efi/lsefisystab.c
-index 7c039c509..902788250 100644
+index 7c039c5097..902788250e 100644
 --- a/grub-core/commands/efi/lsefisystab.c
 +++ b/grub-core/commands/efi/lsefisystab.c
 @@ -40,6 +40,7 @@ static const struct guid_mapping guid_mappings[] =
diff --git a/debian/patches/cherrypick-smbios-module.patch b/debian/patches/cherrypick-smbios-module.patch
index 8bbe12b..a0a649e 100644
--- a/debian/patches/cherrypick-smbios-module.patch
+++ b/debian/patches/cherrypick-smbios-module.patch
@@ -1,4 +1,4 @@
-From 982cd5b597e964da666ebdab41c727823a50c776 Mon Sep 17 00:00:00 2001
+From 1eea32e0f58e90b1a7682f01b06c68f56349fb3d Mon Sep 17 00:00:00 2001
 From: David Michael <[e-mail]>
 Date: Fri, 5 Jul 2019 08:47:09 -0400
 Subject: smbios: Add a module for retrieving SMBIOS information
@@ -33,7 +33,7 @@ Patch-Name: cherrypick-smbios-module.patch
  create mode 100644 include/grub/smbios.h
 
 diff --git a/docs/grub.texi b/docs/grub.texi
-index 1baa0fa20..d573f32cb 100644
+index 1baa0fa20f..d573f32cbb 100644
 --- a/docs/grub.texi
 +++ b/docs/grub.texi
 @@ -3976,6 +3976,7 @@ you forget a command, you can run the command @command{help}
@@ -126,7 +126,7 @@ index 1baa0fa20..d573f32cb 100644
  @subsection source
  
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 33e75021d..9b20f3335 100644
+index 33e75021da..9b20f33355 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
 @@ -1106,6 +1106,21 @@ module = {
@@ -153,7 +153,7 @@ index 33e75021d..9b20f3335 100644
    ieee1275 = commands/ieee1275/suspend.c;
 diff --git a/grub-core/commands/efi/smbios.c b/grub-core/commands/efi/smbios.c
 new file mode 100644
-index 000000000..75202d5aa
+index 0000000000..75202d5aad
 --- /dev/null
 +++ b/grub-core/commands/efi/smbios.c
 @@ -0,0 +1,61 @@
@@ -220,7 +220,7 @@ index 000000000..75202d5aa
 +}
 diff --git a/grub-core/commands/i386/pc/smbios.c b/grub-core/commands/i386/pc/smbios.c
 new file mode 100644
-index 000000000..069d66367
+index 0000000000..069d663673
 --- /dev/null
 +++ b/grub-core/commands/i386/pc/smbios.c
 @@ -0,0 +1,52 @@
@@ -278,7 +278,7 @@ index 000000000..069d66367
 +}
 diff --git a/grub-core/commands/smbios.c b/grub-core/commands/smbios.c
 new file mode 100644
-index 000000000..7a6a391fc
+index 0000000000..7a6a391fc1
 --- /dev/null
 +++ b/grub-core/commands/smbios.c
 @@ -0,0 +1,374 @@
@@ -657,7 +657,7 @@ index 000000000..7a6a391fc
 +  grub_unregister_extcmd (cmd);
 +}
 diff --git a/grub-core/efiemu/i386/pc/cfgtables.c b/grub-core/efiemu/i386/pc/cfgtables.c
-index 492c07c46..e5fffb7d4 100644
+index 492c07c468..e5fffb7d4a 100644
 --- a/grub-core/efiemu/i386/pc/cfgtables.c
 +++ b/grub-core/efiemu/i386/pc/cfgtables.c
 @@ -22,11 +22,11 @@
@@ -696,7 +696,7 @@ index 492c07c46..e5fffb7d4 100644
      }
 diff --git a/include/grub/smbios.h b/include/grub/smbios.h
 new file mode 100644
-index 000000000..15ec260b3
+index 0000000000..15ec260b32
 --- /dev/null
 +++ b/include/grub/smbios.h
 @@ -0,0 +1,69 @@
diff --git a/debian/patches/core-in-fs.patch b/debian/patches/core-in-fs.patch
index 1ba3b4b..b8e13d3 100644
--- a/debian/patches/core-in-fs.patch
+++ b/debian/patches/core-in-fs.patch
@@ -11,7 +11,7 @@ Patch-Name: core-in-fs.patch
  1 file changed, 8 insertions(+)
 
 diff --git a/util/setup.c b/util/setup.c
-index 6f88f3cc4..fbdf2fcc5 100644
+index 6f88f3cc43..fbdf2fcc59 100644
 --- a/util/setup.c
 +++ b/util/setup.c
 @@ -58,6 +58,8 @@
diff --git a/debian/patches/default-grub-d.patch b/debian/patches/default-grub-d.patch
index dc61a66..cf024d6 100644
--- a/debian/patches/default-grub-d.patch
+++ b/debian/patches/default-grub-d.patch
@@ -1,4 +1,4 @@
-From e1e966557a634500e95e2ec691a0cb8fca144aae Mon Sep 17 00:00:00 2001
+From c3ad86f659b0a1af2033086101936f3a17e67a0a Mon Sep 17 00:00:00 2001
 From: Colin Watson <[e-mail]>
 Date: Mon, 13 Jan 2014 12:13:10 +0000
 Subject: Read /etc/default/grub.d/*.cfg after /etc/default/grub
@@ -14,7 +14,7 @@ Patch-Name: default-grub-d.patch
  2 files changed, 98 insertions(+), 21 deletions(-)
 
 diff --git a/grub-core/osdep/unix/config.c b/grub-core/osdep/unix/config.c
-index 65effa9f3..5478030fd 100644
+index 65effa9f3a..5478030fde 100644
 --- a/grub-core/osdep/unix/config.c
 +++ b/grub-core/osdep/unix/config.c
 @@ -24,6 +24,8 @@
@@ -178,7 +178,7 @@ index 65effa9f3..5478030fd 100644
 +  free (cfgdir);
  }
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index b506d63bf..d18bf972f 100644
+index b506d63bf9..d18bf972f7 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
 @@ -164,6 +164,11 @@ fi
diff --git a/debian/patches/disable-floppies.patch b/debian/patches/disable-floppies.patch
index 7d4835e..981b9ec 100644
--- a/debian/patches/disable-floppies.patch
+++ b/debian/patches/disable-floppies.patch
@@ -13,7 +13,7 @@ Patch-Name: disable-floppies.patch
  1 file changed, 12 insertions(+)
 
 diff --git a/grub-core/kern/emu/hostdisk.c b/grub-core/kern/emu/hostdisk.c
-index e9ec680cd..8ac523953 100644
+index e9ec680cdb..8ac5239538 100644
 --- a/grub-core/kern/emu/hostdisk.c
 +++ b/grub-core/kern/emu/hostdisk.c
 @@ -532,6 +532,18 @@ read_device_map (const char *dev_map)
diff --git a/debian/patches/dpkg-version-comparison.patch b/debian/patches/dpkg-version-comparison.patch
index 86e5c7e..929070f 100644
--- a/debian/patches/dpkg-version-comparison.patch
+++ b/debian/patches/dpkg-version-comparison.patch
@@ -12,7 +12,7 @@ Patch-Name: dpkg-version-comparison.patch
  1 file changed, 4 insertions(+), 3 deletions(-)
 
 diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
-index 0f801cab3..b6606c16e 100644
+index 0f801cab3e..b6606c16e0 100644
 --- a/util/grub-mkconfig_lib.in
 +++ b/util/grub-mkconfig_lib.in
 @@ -239,8 +239,9 @@ version_test_numeric ()
diff --git a/debian/patches/efi-variable-storage-minimise-writes.patch b/debian/patches/efi-variable-storage-minimise-writes.patch
index 5078aa3..44ac1ae 100644
--- a/debian/patches/efi-variable-storage-minimise-writes.patch
+++ b/debian/patches/efi-variable-storage-minimise-writes.patch
@@ -1,4 +1,4 @@
-From 20dd578ec8d17d92790121ce010de0e49eaf9cef Mon Sep 17 00:00:00 2001
+From b18e6318f49373c1018be8b6d34266a009f10ae8 Mon Sep 17 00:00:00 2001
 From: Colin Watson <[e-mail]>
 Date: Mon, 11 Mar 2019 11:17:43 +0000
 Subject: Minimise writes to EFI variable storage
@@ -60,7 +60,7 @@ Patch-Name: efi-variable-storage-minimise-writes.patch
  create mode 100644 grub-core/osdep/unix/efivar.c
 
 diff --git a/INSTALL b/INSTALL
-index 8acb40902..342c158e9 100644
+index 8acb409023..342c158e91 100644
 --- a/INSTALL
 +++ b/INSTALL
 @@ -41,6 +41,11 @@ configuring the GRUB.
@@ -76,7 +76,7 @@ index 8acb40902..342c158e9 100644
  
  * libdevmapper 1.02.34 or later (recommended)
 diff --git a/Makefile.util.def b/Makefile.util.def
-index ce133e694..504d1c058 100644
+index ce133e694e..504d1c0581 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
 @@ -565,6 +565,8 @@ program = {
@@ -180,7 +180,7 @@ index ce133e694..504d1c058 100644
  
  script = {
 diff --git a/configure.ac b/configure.ac
-index e382c7480..883245553 100644
+index e382c7480d..883245553d 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -443,6 +443,18 @@ AC_CHECK_HEADER([util.h], [
@@ -204,7 +204,7 @@ index e382c7480..883245553 100644
    CFLAGS="$HOST_CFLAGS -Wtrampolines -Werror"
 diff --git a/grub-core/osdep/efivar.c b/grub-core/osdep/efivar.c
 new file mode 100644
-index 000000000..d2750e252
+index 0000000000..d2750e2524
 --- /dev/null
 +++ b/grub-core/osdep/efivar.c
 @@ -0,0 +1,3 @@
@@ -213,7 +213,7 @@ index 000000000..d2750e252
 +#endif
 diff --git a/grub-core/osdep/unix/efivar.c b/grub-core/osdep/unix/efivar.c
 new file mode 100644
-index 000000000..4a58328b4
+index 0000000000..4a58328b42
 --- /dev/null
 +++ b/grub-core/osdep/unix/efivar.c
 @@ -0,0 +1,508 @@
@@ -726,7 +726,7 @@ index 000000000..4a58328b4
 +
 +#endif /* HAVE_EFIVAR */
 diff --git a/grub-core/osdep/unix/platform.c b/grub-core/osdep/unix/platform.c
-index 9c439326a..b561174ea 100644
+index 9c439326a0..b561174ea9 100644
 --- a/grub-core/osdep/unix/platform.c
 +++ b/grub-core/osdep/unix/platform.c
 @@ -19,15 +19,12 @@
@@ -856,7 +856,7 @@ index 9c439326a..b561174ea 100644
  
  void
 diff --git a/include/grub/util/install.h b/include/grub/util/install.h
-index 8aeb5c4f2..a521f1663 100644
+index 8aeb5c4f20..a521f1663f 100644
 --- a/include/grub/util/install.h
 +++ b/include/grub/util/install.h
 @@ -219,6 +219,11 @@ grub_install_get_default_x86_platform (void);
@@ -872,7 +872,7 @@ index 8aeb5c4f2..a521f1663 100644
  grub_install_register_efi (grub_device_t efidir_grub_dev,
  			   const char *efifile_path,
 diff --git a/util/grub-install.c b/util/grub-install.c
-index 4bad8de61..63462e4e0 100644
+index 4bad8de612..63462e4e09 100644
 --- a/util/grub-install.c
 +++ b/util/grub-install.c
 @@ -2084,7 +2084,7 @@ main (int argc, char *argv[])
diff --git a/debian/patches/efinet-set-dns-from-uefi-proto.patch b/debian/patches/efinet-set-dns-from-uefi-proto.patch
index e500199..fdf062b 100644
--- a/debian/patches/efinet-set-dns-from-uefi-proto.patch
+++ b/debian/patches/efinet-set-dns-from-uefi-proto.patch
@@ -1,4 +1,4 @@
-From 6a014b8846142de23cb5254f653facc8f3456a8c Mon Sep 17 00:00:00 2001
+From 5e2600c379b6ef398a18081b65367f0674c935dc Mon Sep 17 00:00:00 2001
 From: Michael Chang <[e-mail]>
 Date: Thu, 27 Oct 2016 17:43:21 -0400
 Subject: efinet: Setting DNS server from UEFI protocol
@@ -35,7 +35,7 @@ Patch-Name: efinet-set-dns-from-uefi-proto.patch
  2 files changed, 239 insertions(+)
 
 diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
-index 2d3b00f0e..82a28fb6e 100644
+index 2d3b00f0e1..82a28fb6e9 100644
 --- a/grub-core/net/drivers/efi/efinet.c
 +++ b/grub-core/net/drivers/efi/efinet.c
 @@ -30,6 +30,8 @@ GRUB_MOD_LICENSE ("GPLv3+");
@@ -244,7 +244,7 @@ index 2d3b00f0e..82a28fb6e 100644
      }
  
 diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
-index 664cea37b..75befd10e 100644
+index 664cea37b5..75befd10e5 100644
 --- a/include/grub/efi/api.h
 +++ b/include/grub/efi/api.h
 @@ -334,6 +334,16 @@
diff --git a/debian/patches/efinet-set-network-from-uefi-devpath.patch b/debian/patches/efinet-set-network-from-uefi-devpath.patch
index bba19a4..d0d2240 100644
--- a/debian/patches/efinet-set-network-from-uefi-devpath.patch
+++ b/debian/patches/efinet-set-network-from-uefi-devpath.patch
@@ -1,4 +1,4 @@
-From 1bacee679cef6c6f56af81108288c6468d8f6295 Mon Sep 17 00:00:00 2001
+From 521dfb27bc786d0567c97b704381677f57c4cfe4 Mon Sep 17 00:00:00 2001
 From: Michael Chang <[e-mail]>
 Date: Thu, 27 Oct 2016 17:43:05 -0400
 Subject: efinet: Setting network from UEFI device path
@@ -34,7 +34,7 @@ Patch-Name: efinet-set-network-from-uefi-devpath.patch
  2 files changed, 270 insertions(+), 9 deletions(-)
 
 diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
-index fc90415f2..2d3b00f0e 100644
+index fc90415f29..2d3b00f0e1 100644
 --- a/grub-core/net/drivers/efi/efinet.c
 +++ b/grub-core/net/drivers/efi/efinet.c
 @@ -23,6 +23,7 @@
@@ -358,7 +358,7 @@ index fc90415f2..2d3b00f0e 100644
    }
  }
 diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
-index ca6cdc159..664cea37b 100644
+index ca6cdc1596..664cea37b5 100644
 --- a/include/grub/efi/api.h
 +++ b/include/grub/efi/api.h
 @@ -825,6 +825,8 @@ struct grub_efi_ipv4_device_path
diff --git a/debian/patches/efinet-uefi-ipv6-pxe-support.patch b/debian/patches/efinet-uefi-ipv6-pxe-support.patch
index 531e73d..d1f2c02 100644
--- a/debian/patches/efinet-uefi-ipv6-pxe-support.patch
+++ b/debian/patches/efinet-uefi-ipv6-pxe-support.patch
@@ -1,4 +1,4 @@
-From 9afb0c174814d7235fc18623725cd037a76ff541 Mon Sep 17 00:00:00 2001
+From efa94cf400cddc721b15210e46471c867cf727e1 Mon Sep 17 00:00:00 2001
 From: Michael Chang <[e-mail]>
 Date: Thu, 27 Oct 2016 17:41:21 -0400
 Subject: efinet: UEFI IPv6 PXE support
@@ -17,7 +17,7 @@ Patch-Name: efinet-uefi-ipv6-pxe-support.patch
  2 files changed, 73 insertions(+), 6 deletions(-)
 
 diff --git a/grub-core/net/drivers/efi/efinet.c b/grub-core/net/drivers/efi/efinet.c
-index 5388f952b..fc90415f2 100644
+index 5388f952ba..fc90415f29 100644
 --- a/grub-core/net/drivers/efi/efinet.c
 +++ b/grub-core/net/drivers/efi/efinet.c
 @@ -378,11 +378,25 @@ grub_efi_net_config_real (grub_efi_handle_t hnd, char **device,
@@ -52,7 +52,7 @@ index 5388f952b..fc90415f2 100644
    }
  }
 diff --git a/include/grub/efi/api.h b/include/grub/efi/api.h
-index addcbfa8f..ca6cdc159 100644
+index addcbfa8fb..ca6cdc1596 100644
 --- a/include/grub/efi/api.h
 +++ b/include/grub/efi/api.h
 @@ -1452,14 +1452,67 @@ typedef struct grub_efi_simple_text_output_interface grub_efi_simple_text_output
diff --git a/debian/patches/gettext-quiet.patch b/debian/patches/gettext-quiet.patch
index 11a7e6f..6e5d4c2 100644
--- a/debian/patches/gettext-quiet.patch
+++ b/debian/patches/gettext-quiet.patch
@@ -1,4 +1,4 @@
-From 259b7fa08b66717709735370d05fc9eb64682484 Mon Sep 17 00:00:00 2001
+From 02b91d62746f4bde8349bbd605b18fb354a85048 Mon Sep 17 00:00:00 2001
 From: Colin Watson <[e-mail]>
 Date: Mon, 13 Jan 2014 12:13:02 +0000
 Subject: Silence error messages when translations are unavailable
@@ -13,7 +13,7 @@ Patch-Name: gettext-quiet.patch
  1 file changed, 5 insertions(+)
 
 diff --git a/grub-core/gettext/gettext.c b/grub-core/gettext/gettext.c
-index 4d02e62c1..2a19389f2 100644
+index 4d02e62c10..2a19389f2a 100644
 --- a/grub-core/gettext/gettext.c
 +++ b/grub-core/gettext/gettext.c
 @@ -427,6 +427,11 @@ grub_gettext_init_ext (struct grub_gettext_context *ctx,
diff --git a/debian/patches/gfxpayload-dynamic.patch b/debian/patches/gfxpayload-dynamic.patch
index 8545c4d..efdaa14 100644
--- a/debian/patches/gfxpayload-dynamic.patch
+++ b/debian/patches/gfxpayload-dynamic.patch
@@ -1,4 +1,4 @@
-From 2e91d5ab9adfb6a86b82b89715d6d9a7b3b52005 Mon Sep 17 00:00:00 2001
+From 40e9945c86cb9ea3d2a23789e7cdbce9905387e1 Mon Sep 17 00:00:00 2001
 From: Evan Broder <[e-mail]>
 Date: Mon, 13 Jan 2014 12:13:29 +0000
 Subject: Add configure option to enable gfxpayload=keep dynamically
@@ -23,7 +23,7 @@ Patch-Name: gfxpayload-dynamic.patch
  create mode 100644 grub-core/commands/i386/pc/hwmatch.c
 
 diff --git a/configure.ac b/configure.ac
-index 7dda5bb32..dbc429ce0 100644
+index 7dda5bb32b..dbc429ce0a 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1879,6 +1879,17 @@ else
@@ -45,7 +45,7 @@ index 7dda5bb32..dbc429ce0 100644
  
  AC_SUBST([FONT_SOURCE])
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 474a63e68..aadb4cdff 100644
+index 474a63e68c..aadb4cdff8 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
 @@ -971,6 +971,14 @@ module = {
@@ -65,7 +65,7 @@ index 474a63e68..aadb4cdff 100644
    common = commands/keystatus.c;
 diff --git a/grub-core/commands/i386/pc/hwmatch.c b/grub-core/commands/i386/pc/hwmatch.c
 new file mode 100644
-index 000000000..6de07cecc
+index 0000000000..6de07cecc8
 --- /dev/null
 +++ b/grub-core/commands/i386/pc/hwmatch.c
 @@ -0,0 +1,146 @@
@@ -216,7 +216,7 @@ index 000000000..6de07cecc
 +  grub_unregister_command (cmd);
 +}
 diff --git a/include/grub/file.h b/include/grub/file.h
-index 31567483c..e3c4cae2b 100644
+index 31567483cc..e3c4cae2b5 100644
 --- a/include/grub/file.h
 +++ b/include/grub/file.h
 @@ -122,6 +122,7 @@ enum grub_file_type
@@ -228,7 +228,7 @@ index 31567483c..e3c4cae2b 100644
      GRUB_FILE_TYPE_LOADENV,
      GRUB_FILE_TYPE_SAVEENV,
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 2be66c702..09393c28e 100644
+index 2be66c7028..09393c28ee 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -23,6 +23,7 @@ datarootdir="@datarootdir@"
@@ -290,7 +290,7 @@ index 2be66c702..09393c28e 100644
  # yet, so it's empty. In a submenu it will be equal to '\t' (one tab).
  submenu_indentation=""
 diff --git a/util/grub.d/10_linux_zfs.in b/util/grub.d/10_linux_zfs.in
-index 548e14856..fc99f16e7 100755
+index ec4b49d9d7..8cd7d12851 100755
 --- a/util/grub.d/10_linux_zfs.in
 +++ b/util/grub.d/10_linux_zfs.in
 @@ -22,6 +22,7 @@ datarootdir="@datarootdir@"
@@ -301,7 +301,7 @@ index 548e14856..fc99f16e7 100755
  
  . "${pkgdatadir}/grub-mkconfig_lib"
  
-@@ -713,6 +714,41 @@ generate_grub_menu_metadata() {
+@@ -716,6 +717,41 @@ generate_grub_menu_metadata() {
      done
  }
  
@@ -343,7 +343,7 @@ index 548e14856..fc99f16e7 100755
  # Cache for prepare_grub_to_access_device call
  # $1: boot_device
  # $2: submenu_level
-@@ -773,9 +809,11 @@ zfs_linux_entry () {
+@@ -776,9 +812,11 @@ zfs_linux_entry () {
          if [ "${GRUB_GFXPAYLOAD_LINUX}" != "text" ]; then
              echo "${submenu_indentation}	load_video"
          fi
@@ -358,7 +358,7 @@ index 548e14856..fc99f16e7 100755
      fi
  
      echo "${submenu_indentation}	insmod gzio"
-@@ -838,6 +876,8 @@ generate_grub_menu() {
+@@ -841,6 +879,8 @@ generate_grub_menu() {
          GRUB_CMDLINE_LINUX_RECOVERY="${GRUB_CMDLINE_LINUX_RECOVERY} nomodeset"
      fi
  
diff --git a/debian/patches/gfxpayload-keep-default.patch b/debian/patches/gfxpayload-keep-default.patch
index 114ce62..8f48114 100644
--- a/debian/patches/gfxpayload-keep-default.patch
+++ b/debian/patches/gfxpayload-keep-default.patch
@@ -1,4 +1,4 @@
-From 6da735cfaac928da6dc1283a15a669b1ddd07979 Mon Sep 17 00:00:00 2001
+From 6b3668640698cff6e0f57bba665a594c11f02841 Mon Sep 17 00:00:00 2001
 From: Didier Roche <[e-mail]>
 Date: Tue, 31 Mar 2020 15:09:45 +0200
 Subject: Disable gfxpayload=keep by default
@@ -24,7 +24,7 @@ Patch-Name: gfxpayload-keep-default.patch
  2 files changed, 8 deletions(-)
 
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index a75096609..f839b3b55 100644
+index a75096609a..f839b3b55f 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -118,10 +118,6 @@ linux_entry ()
@@ -39,10 +39,10 @@ index a75096609..f839b3b55 100644
        if [ "x$GRUB_GFXPAYLOAD_LINUX" != xtext ]; then
  	  echo "	load_video" | sed "s/^/$submenu_indentation/"
 diff --git a/util/grub.d/10_linux_zfs.in b/util/grub.d/10_linux_zfs.in
-index f50e1231a..d27634738 100755
+index 5ec65fa941..b24587f0a5 100755
 --- a/util/grub.d/10_linux_zfs.in
 +++ b/util/grub.d/10_linux_zfs.in
-@@ -741,10 +741,6 @@ zfs_linux_entry () {
+@@ -744,10 +744,6 @@ zfs_linux_entry () {
      # FIXME: We need an interface to select vesafb in case efifb can't be used.
      if [ "${GRUB_GFXPAYLOAD_LINUX}" = "" ]; then
          echo "${submenu_indentation}	load_video"
diff --git a/debian/patches/grub-install-pvxen-paths.patch b/debian/patches/grub-install-pvxen-paths.patch
index a160a43..b1ca1c4 100644
--- a/debian/patches/grub-install-pvxen-paths.patch
+++ b/debian/patches/grub-install-pvxen-paths.patch
@@ -1,4 +1,4 @@
-From 4e813c89c93bba7da480824d617e87659295841b Mon Sep 17 00:00:00 2001
+From 66bbce074947abe680475dacfb1cde35b7c17ef3 Mon Sep 17 00:00:00 2001
 From: Ian Campbell <[e-mail]>
 Date: Sat, 6 Sep 2014 12:20:12 +0100
 Subject: grub-install: Install PV Xen binaries into the upstream specified
@@ -28,7 +28,7 @@ v2: Respect bootdir, create /boot/xen as needed.
  1 file changed, 22 insertions(+), 2 deletions(-)
 
 diff --git a/util/grub-install.c b/util/grub-install.c
-index 70d6700de..64c292383 100644
+index 70d6700de8..64c292383f 100644
 --- a/util/grub-install.c
 +++ b/util/grub-install.c
 @@ -2058,6 +2058,28 @@ main (int argc, char *argv[])
diff --git a/debian/patches/grub-legacy-0-based-partitions.patch b/debian/patches/grub-legacy-0-based-partitions.patch
index 2039c3f..09439dc 100644
--- a/debian/patches/grub-legacy-0-based-partitions.patch
+++ b/debian/patches/grub-legacy-0-based-partitions.patch
@@ -13,7 +13,7 @@ Patch-Name: grub-legacy-0-based-partitions.patch
  1 file changed, 14 insertions(+)
 
 diff --git a/util/getroot.c b/util/getroot.c
-index 847406fba..cdd41153c 100644
+index 847406fbab..cdd41153c5 100644
 --- a/util/getroot.c
 +++ b/util/getroot.c
 @@ -245,6 +245,20 @@ find_partition (grub_disk_t dsk __attribute__ ((unused)),
diff --git a/debian/patches/grub.cfg-400.patch b/debian/patches/grub.cfg-400.patch
index 1fee91a..4731767 100644
--- a/debian/patches/grub.cfg-400.patch
+++ b/debian/patches/grub.cfg-400.patch
@@ -9,7 +9,7 @@ Patch-Name: grub.cfg-400.patch
  1 file changed, 4 insertions(+)
 
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index 9f477ff05..45cd4cc54 100644
+index 9f477ff054..45cd4cc541 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
 @@ -276,6 +276,10 @@ for i in "${grub_mkconfig_dir}"/* ; do
diff --git a/debian/patches/ieee1275-clear-reset.patch b/debian/patches/ieee1275-clear-reset.patch
index 1d082e6..3d73e0c 100644
--- a/debian/patches/ieee1275-clear-reset.patch
+++ b/debian/patches/ieee1275-clear-reset.patch
@@ -1,4 +1,4 @@
-From 07e29f9e7e317d74d41fed30c6a8ade4f301652c Mon Sep 17 00:00:00 2001
+From 8bec2a413fc7fe8f2a48d37d8127322ebc96971d Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <[e-mail]>
 Date: Thu, 25 Sep 2014 18:41:29 -0300
 Subject: Include a text attribute reset in the clear command for ppc
@@ -18,7 +18,7 @@ Patch-Name: ieee1275-clear-reset.patch
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/grub-core/term/terminfo.c b/grub-core/term/terminfo.c
-index d317efa36..63892ad42 100644
+index d317efa368..63892ad427 100644
 --- a/grub-core/term/terminfo.c
 +++ b/grub-core/term/terminfo.c
 @@ -151,7 +151,7 @@ grub_terminfo_set_current (struct grub_term_output *term,
diff --git a/debian/patches/ignore-grub_func_test-failures.patch b/debian/patches/ignore-grub_func_test-failures.patch
index cbbd3b2..76734f6 100644
--- a/debian/patches/ignore-grub_func_test-failures.patch
+++ b/debian/patches/ignore-grub_func_test-failures.patch
@@ -1,4 +1,4 @@
-From 11457a76c942775508953575e1b284f4c03ee192 Mon Sep 17 00:00:00 2001
+From a4eaed2b739501db9b1009cd778fc72e9670f9ce Mon Sep 17 00:00:00 2001
 From: Colin Watson <[e-mail]>
 Date: Mon, 13 Jan 2014 12:13:32 +0000
 Subject: Ignore functional test failures for now as they are broken
@@ -14,7 +14,7 @@ Patch-Name: ignore-grub_func_test-failures.patch
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/tests/grub_func_test.in b/tests/grub_func_test.in
-index c67f9e422..728cd6e06 100644
+index c67f9e4225..728cd6e066 100644
 --- a/tests/grub_func_test.in
 +++ b/tests/grub_func_test.in
 @@ -16,6 +16,8 @@ out=`echo all_functional_test | @builddir@/grub-shell --timeout=3600 --files="/b
diff --git a/debian/patches/insmod-xzio-and-lzopio-on-xen.patch b/debian/patches/insmod-xzio-and-lzopio-on-xen.patch
index b16f128..6570f74 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 125b4317bafb66a6e9381041102c7d789c296ea4 Mon Sep 17 00:00:00 2001
+From c58c9d77ccd16511db098247b5cbba5abcaac99f Mon Sep 17 00:00:00 2001
 From: Ian Campbell <[e-mail]>
 Date: Sun, 30 Nov 2014 12:12:52 +0000
 Subject: Arrange to insmod xzio and lzopio when booting a kernel as a Xen
@@ -21,7 +21,7 @@ Patch-Name: insmod-xzio-and-lzopio-on-xen.patch
  2 files changed, 2 insertions(+)
 
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 2c418c5ec..85b30084a 100644
+index 2c418c5ec8..85b30084ad 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -166,6 +166,7 @@ linux_entry ()
@@ -33,10 +33,10 @@ index 2c418c5ec..85b30084a 100644
    if [ x$dirname = x/ ]; then
      if [ -z "${prepare_root_cache}" ]; then
 diff --git a/util/grub.d/10_linux_zfs.in b/util/grub.d/10_linux_zfs.in
-index b068f0e96..efdb8afae 100755
+index 4477fa6061..4c48abef01 100755
 --- a/util/grub.d/10_linux_zfs.in
 +++ b/util/grub.d/10_linux_zfs.in
-@@ -835,6 +835,7 @@ zfs_linux_entry () {
+@@ -838,6 +838,7 @@ zfs_linux_entry () {
      fi
  
      echo "${submenu_indentation}	insmod gzio"
diff --git a/debian/patches/install-efi-fallback.patch b/debian/patches/install-efi-fallback.patch
index 6c0f0cf..5a36b4e 100644
--- a/debian/patches/install-efi-fallback.patch
+++ b/debian/patches/install-efi-fallback.patch
@@ -1,4 +1,4 @@
-From 342cbb4b33a6d47e7c1b645ace365203f31165e2 Mon Sep 17 00:00:00 2001
+From 8a5b764a450f0d67f940c2ffbe80eae053753c19 Mon Sep 17 00:00:00 2001
 From: Colin Watson <[e-mail]>
 Date: Mon, 13 Jan 2014 12:13:05 +0000
 Subject: Fall back to non-EFI if booted using EFI but -efi is missing
@@ -19,7 +19,7 @@ Patch-Name: install-efi-fallback.patch
  1 file changed, 35 insertions(+), 5 deletions(-)
 
 diff --git a/grub-core/osdep/linux/platform.c b/grub-core/osdep/linux/platform.c
-index e28a79dab..2e7f72086 100644
+index e28a79dab3..2e7f720869 100644
 --- a/grub-core/osdep/linux/platform.c
 +++ b/grub-core/osdep/linux/platform.c
 @@ -19,10 +19,12 @@
diff --git a/debian/patches/install-efi-ubuntu-flavours.patch b/debian/patches/install-efi-ubuntu-flavours.patch
index 31a74c8..1a6023c 100644
--- a/debian/patches/install-efi-ubuntu-flavours.patch
+++ b/debian/patches/install-efi-ubuntu-flavours.patch
@@ -1,4 +1,4 @@
-From 6def03933e04c3f0d3bbcb37b96dc08d1ba67d74 Mon Sep 17 00:00:00 2001
+From 73faf5c430fe03ec081a838af0e96ad4c42ab26f Mon Sep 17 00:00:00 2001
 From: Colin Watson <[e-mail]>
 Date: Mon, 13 Jan 2014 12:13:27 +0000
 Subject: Cope with Kubuntu setting GRUB_DISTRIBUTOR
@@ -17,7 +17,7 @@ Patch-Name: install-efi-ubuntu-flavours.patch
  1 file changed, 2 insertions(+)
 
 diff --git a/util/grub-install.c b/util/grub-install.c
-index e1e40cf2b..f0d59c180 100644
+index e1e40cf2b5..f0d59c1809 100644
 --- a/util/grub-install.c
 +++ b/util/grub-install.c
 @@ -1115,6 +1115,8 @@ main (int argc, char *argv[])
diff --git a/debian/patches/install-locale-langpack.patch b/debian/patches/install-locale-langpack.patch
index 4537170..531fb38 100644
--- a/debian/patches/install-locale-langpack.patch
+++ b/debian/patches/install-locale-langpack.patch
@@ -1,4 +1,4 @@
-From 4f4b15148b61872395936b083eae7b843ac7d373 Mon Sep 17 00:00:00 2001
+From 50921522fab0f4ce529b6c7acd6354b1b3cff2b1 Mon Sep 17 00:00:00 2001
 From: Colin Watson <[e-mail]>
 Date: Mon, 13 Jan 2014 12:13:07 +0000
 Subject: Prefer translations from Ubuntu language packs if available
@@ -13,7 +13,7 @@ Patch-Name: install-locale-langpack.patch
  1 file changed, 30 insertions(+), 7 deletions(-)
 
 diff --git a/util/grub-install-common.c b/util/grub-install-common.c
-index ca0ac612a..fdfe2c7ea 100644
+index ca0ac612ac..fdfe2c7ead 100644
 --- a/util/grub-install-common.c
 +++ b/util/grub-install-common.c
 @@ -609,17 +609,25 @@ get_localedir (void)
diff --git a/debian/patches/install-powerpc-machtypes.patch b/debian/patches/install-powerpc-machtypes.patch
index bbc8d71..0bd6bcc 100644
--- a/debian/patches/install-powerpc-machtypes.patch
+++ b/debian/patches/install-powerpc-machtypes.patch
@@ -1,4 +1,4 @@
-From 6468fe3eb25e597acd0c80e3f7b5930472328d89 Mon Sep 17 00:00:00 2001
+From 2b3e762ebb12ce0d5a562dd36d23bca5d78aa61c Mon Sep 17 00:00:00 2001
 From: Colin Watson <[e-mail]>
 Date: Tue, 28 Jan 2014 14:40:02 +0000
 Subject: Port yaboot logic for various powerpc machine types
@@ -25,7 +25,7 @@ Patch-Name: install-powerpc-machtypes.patch
  6 files changed, 119 insertions(+), 6 deletions(-)
 
 diff --git a/grub-core/osdep/basic/platform.c b/grub-core/osdep/basic/platform.c
-index a7dafd85a..6c293ed2d 100644
+index a7dafd85a9..6c293ed2d0 100644
 --- a/grub-core/osdep/basic/platform.c
 +++ b/grub-core/osdep/basic/platform.c
 @@ -30,3 +30,8 @@ grub_install_get_default_x86_platform (void)
@@ -38,7 +38,7 @@ index a7dafd85a..6c293ed2d 100644
 +  return "generic";
 +}
 diff --git a/grub-core/osdep/linux/platform.c b/grub-core/osdep/linux/platform.c
-index 2e7f72086..5b37366d4 100644
+index 2e7f720869..5b37366d4d 100644
 --- a/grub-core/osdep/linux/platform.c
 +++ b/grub-core/osdep/linux/platform.c
 @@ -24,6 +24,7 @@
@@ -125,7 +125,7 @@ index 2e7f72086..5b37366d4 100644
 +  return machtype;
 +}
 diff --git a/grub-core/osdep/unix/platform.c b/grub-core/osdep/unix/platform.c
-index 55b8f4016..9c439326a 100644
+index 55b8f40162..9c439326a0 100644
 --- a/grub-core/osdep/unix/platform.c
 +++ b/grub-core/osdep/unix/platform.c
 @@ -218,13 +218,29 @@ grub_install_register_ieee1275 (int is_prep, const char *install_device,
@@ -165,7 +165,7 @@ index 55b8f4016..9c439326a 100644
  
    free (boot_device);
 diff --git a/grub-core/osdep/windows/platform.c b/grub-core/osdep/windows/platform.c
-index 7eb53fe01..e19a3d9a8 100644
+index 7eb53fe01b..e19a3d9a8a 100644
 --- a/grub-core/osdep/windows/platform.c
 +++ b/grub-core/osdep/windows/platform.c
 @@ -128,6 +128,12 @@ grub_install_get_default_x86_platform (void)
@@ -182,7 +182,7 @@ index 7eb53fe01..e19a3d9a8 100644
  get_efi_variable (const wchar_t *varname, ssize_t *len)
  {
 diff --git a/include/grub/util/install.h b/include/grub/util/install.h
-index 2631b1074..8aeb5c4f2 100644
+index 2631b10745..8aeb5c4f20 100644
 --- a/include/grub/util/install.h
 +++ b/include/grub/util/install.h
 @@ -216,6 +216,9 @@ grub_install_get_default_arm_platform (void);
@@ -196,7 +196,7 @@ index 2631b1074..8aeb5c4f2 100644
  grub_install_register_efi (grub_device_t efidir_grub_dev,
  			   const char *efifile_path,
 diff --git a/util/grub-install.c b/util/grub-install.c
-index f0d59c180..70d6700de 100644
+index f0d59c1809..70d6700de8 100644
 --- a/util/grub-install.c
 +++ b/util/grub-install.c
 @@ -1177,7 +1177,18 @@ main (int argc, char *argv[])
diff --git a/debian/patches/install-stage2-confusion.patch b/debian/patches/install-stage2-confusion.patch
index a803a68..fafe60f 100644
--- a/debian/patches/install-stage2-confusion.patch
+++ b/debian/patches/install-stage2-confusion.patch
@@ -1,4 +1,4 @@
-From d9969cb0267a40684bf7a60d70bfc3fc8a962a90 Mon Sep 17 00:00:00 2001
+From bd93043d187b87d8faa11135f3414d67da95a167 Mon Sep 17 00:00:00 2001
 From: Colin Watson <[e-mail]>
 Date: Mon, 13 Jan 2014 12:12:58 +0000
 Subject: If GRUB Legacy is still around, tell packaging to ignore it
@@ -13,7 +13,7 @@ Patch-Name: install-stage2-confusion.patch
  1 file changed, 14 insertions(+)
 
 diff --git a/util/grub-install.c b/util/grub-install.c
-index 8a55ad4b8..3b4606eef 100644
+index 8a55ad4b8d..3b4606eef1 100644
 --- a/util/grub-install.c
 +++ b/util/grub-install.c
 @@ -42,6 +42,7 @@
diff --git a/debian/patches/maybe-quiet.patch b/debian/patches/maybe-quiet.patch
index 64e8d68..da80c4b 100644
--- a/debian/patches/maybe-quiet.patch
+++ b/debian/patches/maybe-quiet.patch
@@ -1,4 +1,4 @@
-From f93cd4fda2916af2b70228878f97cb7bbdeb234d Mon Sep 17 00:00:00 2001
+From 139c9faecee68370e4b46d50ca51d0524029212c Mon Sep 17 00:00:00 2001
 From: Didier Roche <[e-mail]>
 Date: Tue, 31 Mar 2020 15:20:15 +0200
 Subject: Add configure option to reduce visual clutter at boot time
@@ -47,7 +47,7 @@ Patch-Name: maybe-quiet.patch
  10 files changed, 118 insertions(+), 8 deletions(-)
 
 diff --git a/config.h.in b/config.h.in
-index 9e8f9911b..d2c4ce8e5 100644
+index 9e8f9911b1..d2c4ce8e51 100644
 --- a/config.h.in
 +++ b/config.h.in
 @@ -12,6 +12,8 @@
@@ -60,7 +60,7 @@ index 9e8f9911b..d2c4ce8e5 100644
  /* We don't need those.  */
  #define MINILZO_CFG_SKIP_LZO_PTR 1
 diff --git a/configure.ac b/configure.ac
-index 1e5abc67d..ea00ccd69 100644
+index 1e5abc67d9..ea00ccd691 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1857,6 +1857,17 @@ else
@@ -93,7 +93,7 @@ index 1e5abc67d..ea00ccd69 100644
  echo "*******************************************************"
  ]
 diff --git a/grub-core/boot/i386/pc/boot.S b/grub-core/boot/i386/pc/boot.S
-index 2bd0b2d28..b0c0f2225 100644
+index 2bd0b2d286..b0c0f2225e 100644
 --- a/grub-core/boot/i386/pc/boot.S
 +++ b/grub-core/boot/i386/pc/boot.S
 @@ -19,6 +19,9 @@
@@ -125,7 +125,7 @@ index 2bd0b2d28..b0c0f2225 100644
  	movw	$disk_address_packet, %si
  
 diff --git a/grub-core/boot/i386/pc/diskboot.S b/grub-core/boot/i386/pc/diskboot.S
-index c1addc0df..9b6d7a7ed 100644
+index c1addc0df2..9b6d7a7edc 100644
 --- a/grub-core/boot/i386/pc/diskboot.S
 +++ b/grub-core/boot/i386/pc/diskboot.S
 @@ -18,6 +18,9 @@
@@ -205,7 +205,7 @@ index c1addc0df..9b6d7a7ed 100644
  
  notification_step:	.asciz "."
 diff --git a/grub-core/kern/main.c b/grub-core/kern/main.c
-index 9cad0c448..714b63d67 100644
+index 9cad0c4485..714b63d674 100644
 --- a/grub-core/kern/main.c
 +++ b/grub-core/kern/main.c
 @@ -264,15 +264,25 @@ reclaim_module_space (void)
@@ -248,7 +248,7 @@ index 9cad0c448..714b63d67 100644
    grub_rescue_run ();
  }
 diff --git a/grub-core/kern/rescue_reader.c b/grub-core/kern/rescue_reader.c
-index dcd7d4439..a93524eab 100644
+index dcd7d44397..a93524eabb 100644
 --- a/grub-core/kern/rescue_reader.c
 +++ b/grub-core/kern/rescue_reader.c
 @@ -78,7 +78,9 @@ grub_rescue_read_line (char **line, int cont,
@@ -262,7 +262,7 @@ index dcd7d4439..a93524eab 100644
    while (1)
      {
 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index 1b03dfd57..0aa389fa1 100644
+index 1b03dfd57b..0aa389fa16 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
 @@ -389,6 +389,15 @@ static grub_err_t
@@ -292,7 +292,7 @@ index 1b03dfd57..0aa389fa1 100644
    while (1)
      {
 diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
-index 3611ee9ea..ebf5a0f10 100644
+index 3611ee9ea7..ebf5a0f109 100644
 --- a/grub-core/normal/menu.c
 +++ b/grub-core/normal/menu.c
 @@ -827,12 +827,18 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
@@ -339,7 +339,7 @@ index 3611ee9ea..ebf5a0f10 100644
        if (auto_boot)
  	grub_menu_execute_with_fallback (menu, e, autobooted,
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index cb1cc200e..479a8bf4e 100644
+index cb1cc200e4..479a8bf4e5 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -21,6 +21,7 @@ prefix="@prefix@"
@@ -386,7 +386,7 @@ index cb1cc200e..479a8bf4e 100644
  EOF
    fi
 diff --git a/util/grub.d/10_linux_zfs.in b/util/grub.d/10_linux_zfs.in
-index c1dfe8ae8..1a656b2dd 100755
+index bd4f1a2123..3a0e6d1035 100755
 --- a/util/grub.d/10_linux_zfs.in
 +++ b/util/grub.d/10_linux_zfs.in
 @@ -20,6 +20,7 @@ set -e
@@ -397,7 +397,7 @@ index c1dfe8ae8..1a656b2dd 100755
  
  . "${pkgdatadir}/grub-mkconfig_lib"
  
-@@ -776,7 +777,9 @@ zfs_linux_entry () {
+@@ -779,7 +780,9 @@ zfs_linux_entry () {
  
      echo "$(prepare_grub_to_access_device_cached "${boot_device}" "${submenu_level}")"
  
@@ -408,7 +408,7 @@ index c1dfe8ae8..1a656b2dd 100755
  
      linux_default_args="${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
      if [ ${type} = "recovery" ]; then
-@@ -785,7 +788,9 @@ zfs_linux_entry () {
+@@ -788,7 +791,9 @@ zfs_linux_entry () {
  
      echo "${submenu_indentation}	linux	${kernel} root=ZFS=${dataset} ro ${linux_default_args} ${kernel_additional_args}"
  
diff --git a/debian/patches/mkconfig-loopback.patch b/debian/patches/mkconfig-loopback.patch
index 0c7498b..ce4465d 100644
--- a/debian/patches/mkconfig-loopback.patch
+++ b/debian/patches/mkconfig-loopback.patch
@@ -1,4 +1,4 @@
-From 4750b94c28b61e29d3f1bfce6bc7fa8f48c45526 Mon Sep 17 00:00:00 2001
+From 3883a00c8f4a4f59b6a677622776d5bf51337b65 Mon Sep 17 00:00:00 2001
 From: Colin Watson <[e-mail]>
 Date: Mon, 13 Jan 2014 12:13:00 +0000
 Subject: Handle filesystems loop-mounted on file images
@@ -21,7 +21,7 @@ Patch-Name: mkconfig-loopback.patch
  3 files changed, 34 insertions(+)
 
 diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
-index b6606c16e..b05df554d 100644
+index b6606c16e0..b05df554da 100644
 --- a/util/grub-mkconfig_lib.in
 +++ b/util/grub-mkconfig_lib.in
 @@ -133,6 +133,22 @@ prepare_grub_to_access_device ()
@@ -63,7 +63,7 @@ index b6606c16e..b05df554d 100644
  
  grub_get_device_id ()
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index f839b3b55..d927b60ae 100644
+index f839b3b55f..d927b60ae2 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -40,6 +40,11 @@ fi
@@ -79,7 +79,7 @@ index f839b3b55..d927b60ae 100644
  esac
  
 diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
-index 96179ea61..9a8d42fb5 100644
+index 96179ea613..9a8d42fb57 100644
 --- a/util/grub.d/20_linux_xen.in
 +++ b/util/grub.d/20_linux_xen.in
 @@ -40,6 +40,11 @@ fi
diff --git a/debian/patches/mkconfig-mid-upgrade.patch b/debian/patches/mkconfig-mid-upgrade.patch
index 248f6c3..c033bba 100644
--- a/debian/patches/mkconfig-mid-upgrade.patch
+++ b/debian/patches/mkconfig-mid-upgrade.patch
@@ -1,4 +1,4 @@
-From 8ce50d6419c04a49070868a4245664419e0901fa Mon Sep 17 00:00:00 2001
+From 16f168810740a2fd3defa4856ead7b8ded2d1fb5 Mon Sep 17 00:00:00 2001
 From: Colin Watson <[e-mail]>
 Date: Mon, 13 Jan 2014 12:13:03 +0000
 Subject: Bail out if trying to run grub-mkconfig during upgrade to 2.00
@@ -20,7 +20,7 @@ Patch-Name: mkconfig-mid-upgrade.patch
  1 file changed, 7 insertions(+)
 
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index 45cd4cc54..b506d63bf 100644
+index 45cd4cc541..b506d63bf9 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
 @@ -102,6 +102,13 @@ do
diff --git a/debian/patches/mkconfig-nonexistent-loopback.patch b/debian/patches/mkconfig-nonexistent-loopback.patch
index 9b8b848..9ff8309 100644
--- a/debian/patches/mkconfig-nonexistent-loopback.patch
+++ b/debian/patches/mkconfig-nonexistent-loopback.patch
@@ -1,4 +1,4 @@
-From c754f6529f31d14b1110f457e9244f6454a2ed4e Mon Sep 17 00:00:00 2001
+From 0a12aab871f0e938738305d89fc1e32915ea7fda Mon Sep 17 00:00:00 2001
 From: Colin Watson <[e-mail]>
 Date: Mon, 13 Jan 2014 12:13:08 +0000
 Subject: Avoid getting confused by inaccessible loop device backing paths
@@ -14,7 +14,7 @@ Patch-Name: mkconfig-nonexistent-loopback.patch
  2 files changed, 6 insertions(+), 5 deletions(-)
 
 diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
-index b05df554d..fe6319abe 100644
+index b05df554da..fe6319abe0 100644
 --- a/util/grub-mkconfig_lib.in
 +++ b/util/grub-mkconfig_lib.in
 @@ -143,7 +143,7 @@ prepare_grub_to_access_device ()
@@ -27,7 +27,7 @@ index b05df554d..fe6319abe 100644
        esac
      ;;
 diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
-index 775ceb2e0..b7e1147c4 100644
+index 775ceb2e04..b7e1147c41 100644
 --- a/util/grub.d/30_os-prober.in
 +++ b/util/grub.d/30_os-prober.in
 @@ -219,6 +219,11 @@ EOF
diff --git a/debian/patches/mkconfig-other-inits.patch b/debian/patches/mkconfig-other-inits.patch
index e7dd0b6..4b504fb 100644
--- a/debian/patches/mkconfig-other-inits.patch
+++ b/debian/patches/mkconfig-other-inits.patch
@@ -1,4 +1,4 @@
-From 0564e92b1f182280d433e829406bdf91dd19a357 Mon Sep 17 00:00:00 2001
+From 22359dec23434867f467cb704aa771fd63e5ecd9 Mon Sep 17 00:00:00 2001
 From: Colin Watson <[e-mail]>
 Date: Sat, 3 Jan 2015 12:04:59 +0000
 Subject: Generate alternative init entries in advanced menu
@@ -18,7 +18,7 @@ Patch-Name: mkconfig-other-inits.patch
  2 files changed, 21 insertions(+)
 
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 85b30084a..dff84edea 100644
+index 85b30084ad..dff84edea5 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -32,6 +32,7 @@ export TEXTDOMAIN=@PACKAGE@
@@ -53,7 +53,7 @@ index 85b30084a..dff84edea 100644
      linux_entry "${OS}" "${version}" recovery \
                  "${GRUB_CMDLINE_LINUX_RECOVERY} ${GRUB_CMDLINE_LINUX}"
 diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
-index f2ee0532b..81e5f0d7e 100644
+index f2ee0532bd..81e5f0d7e4 100644
 --- a/util/grub.d/20_linux_xen.in
 +++ b/util/grub.d/20_linux_xen.in
 @@ -27,6 +27,7 @@ export TEXTDOMAIN=@PACKAGE@
diff --git a/debian/patches/mkconfig-recovery-title.patch b/debian/patches/mkconfig-recovery-title.patch
index 869fc30..c398318 100644
--- a/debian/patches/mkconfig-recovery-title.patch
+++ b/debian/patches/mkconfig-recovery-title.patch
@@ -1,4 +1,4 @@
-From 0636b004bd56946dd24ce0afff820f9ed76da34b Mon Sep 17 00:00:00 2001
+From cc1216264113d2471a5ee5d472358e265fde1ab5 Mon Sep 17 00:00:00 2001
 From: Colin Watson <[e-mail]>
 Date: Mon, 13 Jan 2014 12:13:33 +0000
 Subject: Add GRUB_RECOVERY_TITLE option
@@ -22,7 +22,7 @@ Patch-Name: mkconfig-recovery-title.patch
  8 files changed, 21 insertions(+), 11 deletions(-)
 
 diff --git a/docs/grub.texi b/docs/grub.texi
-index a835d0ae4..3ec35d315 100644
+index a835d0ae42..3ec35d315a 100644
 --- a/docs/grub.texi
 +++ b/docs/grub.texi
 @@ -1536,6 +1536,11 @@ a console is restricted or limited.
@@ -38,7 +38,7 @@ index a835d0ae4..3ec35d315 100644
  
  The following options are still accepted for compatibility with existing
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index 307214310..9c1da6477 100644
+index 3072143105..9c1da64771 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
 @@ -196,6 +196,10 @@ GRUB_ACTUAL_DEFAULT="$GRUB_DEFAULT"
@@ -63,7 +63,7 @@ index 307214310..9c1da6477 100644
  if test "x${grub_cfg}" != "x"; then
    rm -f "${grub_cfg}.new"
 diff --git a/util/grub.d/10_hurd.in b/util/grub.d/10_hurd.in
-index 59a9a48a2..7fa3a3fbd 100644
+index 59a9a48a2f..7fa3a3fbd8 100644
 --- a/util/grub.d/10_hurd.in
 +++ b/util/grub.d/10_hurd.in
 @@ -88,8 +88,8 @@ hurd_entry () {
@@ -78,7 +78,7 @@ index 59a9a48a2..7fa3a3fbd 100644
  	  title="$(gettext_printf "%s, with Hurd %s" "${OS}" "${kernel_base}")"
  	  oldtitle="$OS using $kernel_base"
 diff --git a/util/grub.d/10_kfreebsd.in b/util/grub.d/10_kfreebsd.in
-index 9d8e8fd85..8301d361a 100644
+index 9d8e8fd852..8301d361a1 100644
 --- a/util/grub.d/10_kfreebsd.in
 +++ b/util/grub.d/10_kfreebsd.in
 @@ -76,7 +76,7 @@ kfreebsd_entry ()
@@ -91,7 +91,7 @@ index 9d8e8fd85..8301d361a 100644
  	  title="$(gettext_printf "%s, with kFreeBSD %s" "${os}" "${version}")"
        fi
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index cc2dd855a..2c418c5ec 100644
+index cc2dd855ab..2c418c5ec8 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -130,7 +130,7 @@ linux_entry ()
@@ -104,10 +104,10 @@ index cc2dd855a..2c418c5ec 100644
  	      title="$(gettext_printf "%s, with Linux %s" "${os}" "${version}")" ;;
        esac
 diff --git a/util/grub.d/10_linux_zfs.in b/util/grub.d/10_linux_zfs.in
-index b636dc7bb..b068f0e96 100755
+index 48a4e68976..4477fa6061 100755
 --- a/util/grub.d/10_linux_zfs.in
 +++ b/util/grub.d/10_linux_zfs.in
-@@ -954,7 +954,7 @@ generate_grub_menu() {
+@@ -957,7 +957,7 @@ generate_grub_menu() {
  
                      GRUB_DISABLE_RECOVERY=${GRUB_DISABLE_RECOVERY:-}
                      if [ "${GRUB_DISABLE_RECOVERY}" != "true" ]; then
@@ -116,7 +116,7 @@ index b636dc7bb..b068f0e96 100755
                          zfs_linux_entry 1 "${title}" "recovery" "${dataset}" "${device}" "${initrd}" "${kernel}"
                      fi
                      at_least_one_entry=1
-@@ -982,9 +982,9 @@ generate_grub_menu() {
+@@ -985,9 +985,9 @@ generate_grub_menu() {
  
                          GRUB_DISABLE_RECOVERY="${GRUB_DISABLE_RECOVERY:-}"
                          if [ "${GRUB_DISABLE_RECOVERY}" != "true" ]; then
@@ -128,7 +128,7 @@ index b636dc7bb..b068f0e96 100755
                              zfs_linux_entry 2 "${title}" "recovery" "${dataset}" "${device}" "${initrd}" "${kernel}" "zsys-revert=userdata"
                          fi
                      # Non-zsys: boot temporarly on snapshots or rollback (destroying intermediate snapshots)
-@@ -994,7 +994,7 @@ generate_grub_menu() {
+@@ -997,7 +997,7 @@ generate_grub_menu() {
  
                          GRUB_DISABLE_RECOVERY="${GRUB_DISABLE_RECOVERY:-}"
                          if [ "${GRUB_DISABLE_RECOVERY}" != "true" ]; then
@@ -138,7 +138,7 @@ index b636dc7bb..b068f0e96 100755
                          fi
  
 diff --git a/util/grub.d/10_netbsd.in b/util/grub.d/10_netbsd.in
-index 874f59969..bb29cc046 100644
+index 874f59969e..bb29cc0468 100644
 --- a/util/grub.d/10_netbsd.in
 +++ b/util/grub.d/10_netbsd.in
 @@ -102,7 +102,7 @@ netbsd_entry ()
@@ -151,7 +151,7 @@ index 874f59969..bb29cc046 100644
  	  title="$(gettext_printf "%s, with kernel %s (via %s)" "${OS}" "$(echo ${kernel} | sed -e 's,^.*/,,')" "${loader}")"
        fi
 diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
-index 9a8d42fb5..f2ee0532b 100644
+index 9a8d42fb57..f2ee0532bd 100644
 --- a/util/grub.d/20_linux_xen.in
 +++ b/util/grub.d/20_linux_xen.in
 @@ -105,7 +105,7 @@ linux_entry ()
diff --git a/debian/patches/mkconfig-signed-kernel.patch b/debian/patches/mkconfig-signed-kernel.patch
index ea7cdb0..79ae0da 100644
--- a/debian/patches/mkconfig-signed-kernel.patch
+++ b/debian/patches/mkconfig-signed-kernel.patch
@@ -1,4 +1,4 @@
-From 956c3d193e7c756f52fc0cfda463eb17ed58b4ce Mon Sep 17 00:00:00 2001
+From 16c328eee53e3fe8c24db8c2438a7410755c58db Mon Sep 17 00:00:00 2001
 From: Didier Roche <[e-mail]>
 Date: Tue, 31 Mar 2020 15:17:45 +0200
 Subject: Generate configuration for signed UEFI kernels if available
@@ -13,7 +13,7 @@ Patch-Name: mkconfig-signed-kernel.patch
  2 files changed, 36 insertions(+)
 
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 19e4df4ad..cb1cc200e 100644
+index 19e4df4ad8..cb1cc200e4 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -165,8 +165,16 @@ linux_entry ()
@@ -48,7 +48,7 @@ index 19e4df4ad..cb1cc200e 100644
    basename=`basename $linux`
    dirname=`dirname $linux`
 diff --git a/util/grub.d/10_linux_zfs.in b/util/grub.d/10_linux_zfs.in
-index bd5b963b6..c1dfe8ae8 100755
+index 7f88e771e0..bd4f1a2123 100755
 --- a/util/grub.d/10_linux_zfs.in
 +++ b/util/grub.d/10_linux_zfs.in
 @@ -339,6 +339,16 @@ try_default_layout_bpool() {
@@ -68,7 +68,7 @@ index bd5b963b6..c1dfe8ae8 100755
  # Given a filesystem or snapshot dataset, returns dataset|machine id|pretty name|last used
  # $1 is dataset we want information from
  # $2 is the temporary mount directory to use
-@@ -409,6 +419,17 @@ get_dataset_info() {
+@@ -412,6 +422,17 @@ get_dataset_info() {
              continue
          fi
  
diff --git a/debian/patches/mkconfig-ubuntu-distributor.patch b/debian/patches/mkconfig-ubuntu-distributor.patch
index 6ae0bef..d1e2f67 100644
--- a/debian/patches/mkconfig-ubuntu-distributor.patch
+++ b/debian/patches/mkconfig-ubuntu-distributor.patch
@@ -1,4 +1,4 @@
-From 5cddc9390afad242b31604806e8fb46ca92bf891 Mon Sep 17 00:00:00 2001
+From 77ada294ae9feca7e4202f454ddf56245eee16bf Mon Sep 17 00:00:00 2001
 From: Mario Limonciello <[e-mail]>
 Date: Mon, 13 Jan 2014 12:13:14 +0000
 Subject: Remove GNU/Linux from default distributor string for Ubuntu
@@ -17,7 +17,7 @@ Patch-Name: mkconfig-ubuntu-distributor.patch
  2 files changed, 16 insertions(+), 2 deletions(-)
 
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index fcd303387..19e4df4ad 100644
+index fcd3033872..19e4df4ad8 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -32,7 +32,14 @@ CLASS="--class gnu-linux --class gnu --class os"
@@ -37,10 +37,10 @@ index fcd303387..19e4df4ad 100644
  fi
  
 diff --git a/util/grub.d/10_linux_zfs.in b/util/grub.d/10_linux_zfs.in
-index 5db1f6682..bd5b963b6 100755
+index de4d215900..7f88e771e0 100755
 --- a/util/grub.d/10_linux_zfs.in
 +++ b/util/grub.d/10_linux_zfs.in
-@@ -787,7 +787,14 @@ generate_grub_menu() {
+@@ -790,7 +790,14 @@ generate_grub_menu() {
      if [ "${GRUB_DISTRIBUTOR}" = "" ] ; then
          OS=GNU/Linux
      else
diff --git a/debian/patches/mkconfig-ubuntu-recovery.patch b/debian/patches/mkconfig-ubuntu-recovery.patch
index f81ab40..097df91 100644
--- a/debian/patches/mkconfig-ubuntu-recovery.patch
+++ b/debian/patches/mkconfig-ubuntu-recovery.patch
@@ -1,4 +1,4 @@
-From fb4d204572ca4dec63b3d3f25a3b69da97815726 Mon Sep 17 00:00:00 2001
+From 51814873e68db3d990a080f705e6562ef140b416 Mon Sep 17 00:00:00 2001
 From: Didier Roche <[e-mail]>
 Date: Tue, 31 Mar 2020 15:16:36 +0200
 Subject: "single" -> "recovery" when friendly-recovery is installed
@@ -24,7 +24,7 @@ Patch-Name: mkconfig-ubuntu-recovery.patch
  4 files changed, 39 insertions(+), 5 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 7656f2434..1e5abc67d 100644
+index 7656f2434e..1e5abc67d9 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1846,6 +1846,17 @@ fi
@@ -46,7 +46,7 @@ index 7656f2434..1e5abc67d 100644
  
  AC_SUBST([FONT_SOURCE])
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index d927b60ae..fcd303387 100644
+index d927b60ae2..fcd3033872 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -20,6 +20,7 @@ set -e
@@ -94,7 +94,7 @@ index d927b60ae..fcd303387 100644
  
    list=`echo $list | tr ' ' '\n' | fgrep -vx "$linux" | tr '\n' ' '`
 diff --git a/util/grub.d/10_linux_zfs.in b/util/grub.d/10_linux_zfs.in
-index d27634738..5db1f6682 100755
+index b24587f0a5..de4d215900 100755
 --- a/util/grub.d/10_linux_zfs.in
 +++ b/util/grub.d/10_linux_zfs.in
 @@ -19,6 +19,7 @@ set -e
@@ -105,7 +105,7 @@ index d27634738..5db1f6682 100755
  
  . "${pkgdatadir}/grub-mkconfig_lib"
  
-@@ -745,7 +746,9 @@ zfs_linux_entry () {
+@@ -748,7 +749,9 @@ zfs_linux_entry () {
          if [ "${GRUB_GFXPAYLOAD_LINUX}" != "text" ]; then
              echo "${submenu_indentation}	load_video"
          fi
@@ -116,7 +116,7 @@ index d27634738..5db1f6682 100755
      fi
  
      echo "${submenu_indentation}	insmod gzio"
-@@ -756,7 +759,7 @@ zfs_linux_entry () {
+@@ -759,7 +762,7 @@ zfs_linux_entry () {
  
      linux_default_args="${GRUB_CMDLINE_LINUX} ${GRUB_CMDLINE_LINUX_DEFAULT}"
      if [ ${type} = "recovery" ]; then
@@ -125,7 +125,7 @@ index d27634738..5db1f6682 100755
      fi
  
      echo "${submenu_indentation}	linux	${kernel} root=ZFS=${dataset} ro ${linux_default_args} ${kernel_additional_args}"
-@@ -788,6 +791,14 @@ generate_grub_menu() {
+@@ -791,6 +794,14 @@ generate_grub_menu() {
          CLASS="--class $(echo ${GRUB_DISTRIBUTOR} | tr 'A-Z' 'a-z' | cut -d' ' -f1 | LC_ALL=C sed 's,[^[:alnum:]_],_,g') ${CLASS}"
      fi
  
@@ -141,7 +141,7 @@ index d27634738..5db1f6682 100755
      # IFS is set to TAB (ASCII 0x09)
      echo "${menu_metadata}" |
 diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
-index 515a68c7a..775ceb2e0 100644
+index 515a68c7aa..775ceb2e04 100644
 --- a/util/grub.d/30_os-prober.in
 +++ b/util/grub.d/30_os-prober.in
 @@ -220,7 +220,7 @@ EOF
diff --git a/debian/patches/mkrescue-efi-modules.patch b/debian/patches/mkrescue-efi-modules.patch
index d0e0688..54d15e4 100644
--- a/debian/patches/mkrescue-efi-modules.patch
+++ b/debian/patches/mkrescue-efi-modules.patch
@@ -1,4 +1,4 @@
-From 40df0707380bf528d9f849b065c3a5e4e96113ac Mon Sep 17 00:00:00 2001
+From 20edd1abb590756c35b886849a15d17d80f82170 Mon Sep 17 00:00:00 2001
 From: Mario Limonciello <[e-mail]>
 Date: Mon, 13 Jan 2014 12:12:59 +0000
 Subject: Build vfat into EFI boot images
@@ -14,7 +14,7 @@ Patch-Name: mkrescue-efi-modules.patch
  1 file changed, 2 insertions(+)
 
 diff --git a/util/grub-mkrescue.c b/util/grub-mkrescue.c
-index ce2cbc4f1..45d6140d3 100644
+index ce2cbc4f10..45d6140d3e 100644
 --- a/util/grub-mkrescue.c
 +++ b/util/grub-mkrescue.c
 @@ -750,6 +750,7 @@ main (int argc, char *argv[])
diff --git a/debian/patches/net-read-bracketed-ipv6-addr.patch b/debian/patches/net-read-bracketed-ipv6-addr.patch
index 9afab37..76e97c9 100644
--- a/debian/patches/net-read-bracketed-ipv6-addr.patch
+++ b/debian/patches/net-read-bracketed-ipv6-addr.patch
@@ -1,4 +1,4 @@
-From 5b535ee06d2b6e98a6b9c7d1a79ff611e10e1b0a Mon Sep 17 00:00:00 2001
+From 370386aaaed787b4b9082cd75f155f1b21350878 Mon Sep 17 00:00:00 2001
 From: Aaron Miller <[e-mail]>
 Date: Thu, 27 Oct 2016 17:39:49 -0400
 Subject: net: read bracketed ipv6 addrs and port numbers
@@ -16,7 +16,7 @@ Patch-Name: net-read-bracketed-ipv6-addr.patch
  4 files changed, 110 insertions(+), 11 deletions(-)
 
 diff --git a/grub-core/net/http.c b/grub-core/net/http.c
-index 5aa4ad3be..f182d7b87 100644
+index 5aa4ad3bef..f182d7b871 100644
 --- a/grub-core/net/http.c
 +++ b/grub-core/net/http.c
 @@ -312,12 +312,14 @@ http_establish (struct grub_file *file, grub_off_t offset, int initial)
@@ -74,7 +74,7 @@ index 5aa4ad3be..f182d7b87 100644
  				  file);
    if (!data->sock)
 diff --git a/grub-core/net/net.c b/grub-core/net/net.c
-index d5d726a31..b917a75d5 100644
+index d5d726a315..b917a75d54 100644
 --- a/grub-core/net/net.c
 +++ b/grub-core/net/net.c
 @@ -437,6 +437,12 @@ parse_ip6 (const char *val, grub_uint64_t *ip, const char **rest)
@@ -211,7 +211,7 @@ index d5d726a31..b917a75d5 100644
  	  }
        }
 diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c
-index 7d90bf66e..a0817a075 100644
+index 7d90bf66e7..a0817a075d 100644
 --- a/grub-core/net/tftp.c
 +++ b/grub-core/net/tftp.c
 @@ -314,6 +314,7 @@ tftp_open (struct grub_file *file, const char *filename)
@@ -241,7 +241,7 @@ index 7d90bf66e..a0817a075 100644
    if (!data->sock)
      {
 diff --git a/include/grub/net.h b/include/grub/net.h
-index 4a9069a14..cc114286e 100644
+index 4a9069a147..cc114286ea 100644
 --- a/include/grub/net.h
 +++ b/include/grub/net.h
 @@ -270,6 +270,7 @@ typedef struct grub_net
diff --git a/debian/patches/no-devicetree-if-secure-boot.patch b/debian/patches/no-devicetree-if-secure-boot.patch
index 2c20d15..c56d2e3 100644
--- a/debian/patches/no-devicetree-if-secure-boot.patch
+++ b/debian/patches/no-devicetree-if-secure-boot.patch
@@ -1,4 +1,4 @@
-From e7c4e6c655bc9eebdd22fb6f3d9b2aafabffa1b4 Mon Sep 17 00:00:00 2001
+From 7419d200192a1214872a70852200922529baa7b8 Mon Sep 17 00:00:00 2001
 From: Peter Jones <[e-mail]>
 Date: Wed, 24 Apr 2019 10:03:04 -0400
 Subject: Forbid the "devicetree" command when Secure Boot is enabled.
@@ -17,7 +17,7 @@ Patch-Name: no-devicetree-if-secure-boot.patch
  2 files changed, 20 insertions(+)
 
 diff --git a/grub-core/loader/arm/linux.c b/grub-core/loader/arm/linux.c
-index 51684914c..092e8e307 100644
+index 51684914cf..092e8e3077 100644
 --- a/grub-core/loader/arm/linux.c
 +++ b/grub-core/loader/arm/linux.c
 @@ -30,6 +30,10 @@
@@ -47,7 +47,7 @@ index 51684914c..092e8e307 100644
    if (!dtb)
      return grub_errno;
 diff --git a/grub-core/loader/efi/fdt.c b/grub-core/loader/efi/fdt.c
-index ee9c5592c..f0c2d91be 100644
+index ee9c5592c7..f0c2d91be2 100644
 --- a/grub-core/loader/efi/fdt.c
 +++ b/grub-core/loader/efi/fdt.c
 @@ -123,6 +123,14 @@ grub_cmd_devicetree (grub_command_t cmd __attribute__ ((unused)),
diff --git a/debian/patches/no-insmod-on-sb.patch b/debian/patches/no-insmod-on-sb.patch
index 95a34cd..5ed0187 100644
--- a/debian/patches/no-insmod-on-sb.patch
+++ b/debian/patches/no-insmod-on-sb.patch
@@ -1,4 +1,4 @@
-From 98ac694bdd7938cdfcd5615cc78e3211a0bcba93 Mon Sep 17 00:00:00 2001
+From df8702b930179447a7ecaf8bb0f9842522967a41 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <[e-mail]>
 Date: Mon, 13 Jan 2014 12:13:09 +0000
 Subject: Don't permit loading modules on UEFI secure boot
@@ -16,7 +16,7 @@ Patch-Name: no-insmod-on-sb.patch
  3 files changed, 42 insertions(+)
 
 diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
-index 48eb5e7b6..074dfc3c6 100644
+index 48eb5e7b62..074dfc3c6f 100644
 --- a/grub-core/kern/dl.c
 +++ b/grub-core/kern/dl.c
 @@ -38,6 +38,10 @@
@@ -47,7 +47,7 @@ index 48eb5e7b6..074dfc3c6 100644
  
    file = grub_file_open (filename, GRUB_FILE_TYPE_GRUB_MODULE);
 diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
-index 6e1ceb905..96204e39b 100644
+index 6e1ceb9051..96204e39b9 100644
 --- a/grub-core/kern/efi/efi.c
 +++ b/grub-core/kern/efi/efi.c
 @@ -273,6 +273,34 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid,
@@ -86,7 +86,7 @@ index 6e1ceb905..96204e39b 100644
  
  /* Search the mods section from the PE32/PE32+ image. This code uses
 diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
-index e90e00dc4..a237952b3 100644
+index e90e00dc43..a237952b37 100644
 --- a/include/grub/efi/efi.h
 +++ b/include/grub/efi/efi.h
 @@ -82,6 +82,7 @@ EXPORT_FUNC (grub_efi_set_variable) (const char *var,
diff --git a/debian/patches/olpc-prefix-hack.patch b/debian/patches/olpc-prefix-hack.patch
index b14c333..d40729f 100644
--- a/debian/patches/olpc-prefix-hack.patch
+++ b/debian/patches/olpc-prefix-hack.patch
@@ -11,7 +11,7 @@ Patch-Name: olpc-prefix-hack.patch
  1 file changed, 11 insertions(+)
 
 diff --git a/grub-core/kern/ieee1275/init.c b/grub-core/kern/ieee1275/init.c
-index d483e35ee..8b089b48d 100644
+index d483e35eed..8b089b48d0 100644
 --- a/grub-core/kern/ieee1275/init.c
 +++ b/grub-core/kern/ieee1275/init.c
 @@ -76,6 +76,7 @@ grub_exit (void)
diff --git a/debian/patches/ppc64el-disable-vsx.patch b/debian/patches/ppc64el-disable-vsx.patch
index ab96b1d..3aef631 100644
--- a/debian/patches/ppc64el-disable-vsx.patch
+++ b/debian/patches/ppc64el-disable-vsx.patch
@@ -1,4 +1,4 @@
-From 0bdaf481feca277ee87f42052fad4a59ede0c8e4 Mon Sep 17 00:00:00 2001
+From 7736a6a5e58402b8f88d053ce2409b2d16262be5 Mon Sep 17 00:00:00 2001
 From: Paulo Flabiano Smorigo <[e-mail]>
 Date: Thu, 25 Sep 2014 19:33:39 -0300
 Subject: Disable VSX instruction
@@ -21,7 +21,7 @@ Patch-Name: ppc64el-disable-vsx.patch
  1 file changed, 12 insertions(+)
 
 diff --git a/grub-core/kern/powerpc/ieee1275/startup.S b/grub-core/kern/powerpc/ieee1275/startup.S
-index 21c884b43..de9a9601a 100644
+index 21c884b433..de9a9601a9 100644
 --- a/grub-core/kern/powerpc/ieee1275/startup.S
 +++ b/grub-core/kern/powerpc/ieee1275/startup.S
 @@ -20,6 +20,8 @@
diff --git a/debian/patches/probe-fusionio.patch b/debian/patches/probe-fusionio.patch
index 7756341..ad7ef51 100644
--- a/debian/patches/probe-fusionio.patch
+++ b/debian/patches/probe-fusionio.patch
@@ -1,4 +1,4 @@
-From 738369f06f930cedd51f22f9d519a09aa7e73176 Mon Sep 17 00:00:00 2001
+From c89a80f695775566c7f184ec19b4ad34f58906bb Mon Sep 17 00:00:00 2001
 From: Colin Watson <[e-mail]>
 Date: Mon, 13 Jan 2014 12:13:31 +0000
 Subject: Probe FusionIO devices
@@ -14,7 +14,7 @@ Patch-Name: probe-fusionio.patch
  2 files changed, 32 insertions(+)
 
 diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c
-index 90d92d3ad..7adc0f30e 100644
+index 90d92d3ad5..7adc0f30ee 100644
 --- a/grub-core/osdep/linux/getroot.c
 +++ b/grub-core/osdep/linux/getroot.c
 @@ -950,6 +950,19 @@ grub_util_part_to_disk (const char *os_dev, struct stat *st,
@@ -38,7 +38,7 @@ index 90d92d3ad..7adc0f30e 100644
  
    return path;
 diff --git a/util/deviceiter.c b/util/deviceiter.c
-index a4971ef42..dddc50da7 100644
+index a4971ef429..dddc50da7a 100644
 --- a/util/deviceiter.c
 +++ b/util/deviceiter.c
 @@ -383,6 +383,12 @@ get_nvme_disk_name (char *name, int controller, int namespace)
diff --git a/debian/patches/quick-boot-lvm.patch b/debian/patches/quick-boot-lvm.patch
index 23a9989..e313019 100644
--- a/debian/patches/quick-boot-lvm.patch
+++ b/debian/patches/quick-boot-lvm.patch
@@ -1,4 +1,4 @@
-From ff47caaf5a89c61bb85e7ed22570b24481b9ff15 Mon Sep 17 00:00:00 2001
+From 193f060dd7c98d850e81a0b73383ff19c4374d64 Mon Sep 17 00:00:00 2001
 From: Steve Langasek <[e-mail]>
 Date: Tue, 30 Oct 2018 15:04:16 -0700
 Subject: If we don't have writable grubenv and we're on EFI, always show the
@@ -26,7 +26,7 @@ Patch-Name: quick-boot-lvm.patch
  1 file changed, 15 insertions(+), 3 deletions(-)
 
 diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
-index 674a76140..b7135b655 100644
+index 674a761402..b7135b655f 100644
 --- a/util/grub.d/00_header.in
 +++ b/util/grub.d/00_header.in
 @@ -115,7 +115,7 @@ EOF
diff --git a/debian/patches/quick-boot.patch b/debian/patches/quick-boot.patch
index 01fc3c9..ad4650d 100644
--- a/debian/patches/quick-boot.patch
+++ b/debian/patches/quick-boot.patch
@@ -1,4 +1,4 @@
-From a62555d9b0bc27ecf2c018018d61589ebdf15321 Mon Sep 17 00:00:00 2001
+From a34a2ebb74968f6a460fd0f90c545f3e847a3411 Mon Sep 17 00:00:00 2001
 From: Colin Watson <[e-mail]>
 Date: Mon, 13 Jan 2014 12:13:28 +0000
 Subject: Add configure option to bypass boot menu if possible
@@ -34,7 +34,7 @@ Patch-Name: quick-boot.patch
  8 files changed, 146 insertions(+), 13 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index ea00ccd69..7dda5bb32 100644
+index ea00ccd691..7dda5bb32b 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1868,6 +1868,17 @@ else
@@ -56,7 +56,7 @@ index ea00ccd69..7dda5bb32 100644
  
  AC_SUBST([FONT_SOURCE])
 diff --git a/docs/grub.texi b/docs/grub.texi
-index 87795075a..a835d0ae4 100644
+index 87795075a8..a835d0ae42 100644
 --- a/docs/grub.texi
 +++ b/docs/grub.texi
 @@ -1522,6 +1522,20 @@ This option may be set to a list of GRUB module names separated by spaces.
@@ -81,7 +81,7 @@ index 87795075a..a835d0ae4 100644
  
  The following options are still accepted for compatibility with existing
 diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
-index ebf5a0f10..42c82290d 100644
+index ebf5a0f109..42c82290de 100644
 --- a/grub-core/normal/menu.c
 +++ b/grub-core/normal/menu.c
 @@ -604,6 +604,30 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
@@ -116,7 +116,7 @@ index ebf5a0f10..42c82290d 100644
  	{
  	  pos = grub_term_save_pos ();
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index d18bf972f..307214310 100644
+index d18bf972f7..3072143105 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
 @@ -250,7 +250,8 @@ export GRUB_DEFAULT \
@@ -130,7 +130,7 @@ index d18bf972f..307214310 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 93a90233e..674a76140 100644
+index 93a90233ea..674a761402 100644
 --- a/util/grub.d/00_header.in
 +++ b/util/grub.d/00_header.in
 @@ -21,6 +21,8 @@ prefix="@prefix@"
@@ -259,7 +259,7 @@ index 93a90233e..674a76140 100644
  EOF
  }
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 479a8bf4e..2be66c702 100644
+index 479a8bf4e5..2be66c7028 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -22,6 +22,7 @@ exec_prefix="@exec_prefix@"
@@ -281,7 +281,7 @@ index 479a8bf4e..2be66c702 100644
        save_default_entry | grub_add_tab
    fi
 diff --git a/util/grub.d/10_linux_zfs.in b/util/grub.d/10_linux_zfs.in
-index 1a656b2dd..548e14856 100755
+index 3a0e6d1035..ec4b49d9d7 100755
 --- a/util/grub.d/10_linux_zfs.in
 +++ b/util/grub.d/10_linux_zfs.in
 @@ -21,6 +21,7 @@ prefix="@prefix@"
@@ -292,7 +292,7 @@ index 1a656b2dd..548e14856 100755
  
  . "${pkgdatadir}/grub-mkconfig_lib"
  
-@@ -752,6 +753,10 @@ zfs_linux_entry () {
+@@ -755,6 +756,10 @@ zfs_linux_entry () {
  
      echo "${submenu_indentation}menuentry '$(echo "${title}" | grub_quote)' ${CLASS} \${menuentry_id_option} 'gnulinux-${dataset}-${kernel_version}' {"
  
@@ -304,7 +304,7 @@ index 1a656b2dd..548e14856 100755
          GRUB_SAVEDEFAULT=${GRUB_SAVEDEFAULT:-}
          default_entry="$(save_default_entry)"
 diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
-index 271044f59..da5f28876 100644
+index 271044f592..da5f28876d 100644
 --- a/util/grub.d/30_os-prober.in
 +++ b/util/grub.d/30_os-prober.in
 @@ -20,12 +20,26 @@ set -e
diff --git a/debian/patches/restore-mkdevicemap.patch b/debian/patches/restore-mkdevicemap.patch
index 267b972..7236a7b 100644
--- a/debian/patches/restore-mkdevicemap.patch
+++ b/debian/patches/restore-mkdevicemap.patch
@@ -1,4 +1,4 @@
-From 6db8234a46f194578fb414730dd3ea80a60b13d4 Mon Sep 17 00:00:00 2001
+From 9e77654bae1ee822ee7ae4e90e5f043105388ee4 Mon Sep 17 00:00:00 2001
 From: Colin Watson <[e-mail]>
 Date: Mon, 13 Jan 2014 12:13:01 +0000
 Subject: Restore grub-mkdevicemap
@@ -28,7 +28,7 @@ Patch-Name: restore-mkdevicemap.patch
  create mode 100644 util/grub-mkdevicemap.c
 
 diff --git a/Makefile.util.def b/Makefile.util.def
-index bac85e284..eec1924b0 100644
+index bac85e2840..eec1924b0e 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
 @@ -324,6 +324,23 @@ program = {
@@ -57,7 +57,7 @@ index bac85e284..eec1924b0 100644
    installdir = sbin;
 diff --git a/docs/man/grub-mkdevicemap.h2m b/docs/man/grub-mkdevicemap.h2m
 new file mode 100644
-index 000000000..96cd6ee72
+index 0000000000..96cd6ee723
 --- /dev/null
 +++ b/docs/man/grub-mkdevicemap.h2m
 @@ -0,0 +1,4 @@
@@ -67,7 +67,7 @@ index 000000000..96cd6ee72
 +.BR grub-probe (8)
 diff --git a/include/grub/util/deviceiter.h b/include/grub/util/deviceiter.h
 new file mode 100644
-index 000000000..85374978c
+index 0000000000..85374978c5
 --- /dev/null
 +++ b/include/grub/util/deviceiter.h
 @@ -0,0 +1,14 @@
@@ -87,7 +87,7 @@ index 000000000..85374978c
 +#endif /* ! GRUB_DEVICEITER_MACHINE_UTIL_HEADER */
 diff --git a/util/deviceiter.c b/util/deviceiter.c
 new file mode 100644
-index 000000000..a4971ef42
+index 0000000000..a4971ef429
 --- /dev/null
 +++ b/util/deviceiter.c
 @@ -0,0 +1,1021 @@
@@ -1114,7 +1114,7 @@ index 000000000..a4971ef42
 +}
 diff --git a/util/devicemap.c b/util/devicemap.c
 new file mode 100644
-index 000000000..c61864420
+index 0000000000..c61864420a
 --- /dev/null
 +++ b/util/devicemap.c
 @@ -0,0 +1,13 @@
@@ -1133,7 +1133,7 @@ index 000000000..c61864420
 +}
 diff --git a/util/grub-mkdevicemap.c b/util/grub-mkdevicemap.c
 new file mode 100644
-index 000000000..c4bbdbf69
+index 0000000000..c4bbdbf69c
 --- /dev/null
 +++ b/util/grub-mkdevicemap.c
 @@ -0,0 +1,181 @@
diff --git a/debian/patches/series b/debian/patches/series
index 74189fd..4f8471c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -62,7 +62,6 @@ ubuntu-shorter-version-info.patch
 ubuntu-add-initrd-less-boot-fallback.patch
 ubuntu-mkconfig-leave-breadcrumbs.patch
 ubuntu-fix-lzma-decompressor-objcopy.patch
-ubuntu-clear-invalid-initrd-spacing.patch
 ubuntu-temp-keep-auto-nvram.patch
 ubuntu-add-devicetree-command-support.patch
 ubuntu-boot-from-multipath-dependent-symlink.patch
@@ -72,35 +71,38 @@ ubuntu-efi-allow-loopmount-chainload.patch
 cherrypick-lsefisystab-define-smbios3.patch
 cherrypick-smbios-module.patch
 cherrypick-lsefisystab-show-dtb.patch
-0075-uefi-firmware-rename-fwsetup-menuentry-to-UEFI-Firmw.patch
-0076-smbios-Add-a-linux-argument-to-apply-linux-modalias-.patch
-0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch
-0078-ubuntu-Update-the-linux-boot-protocol-version-check.patch
+0074-uefi-firmware-rename-fwsetup-menuentry-to-UEFI-Firmw.patch
+0075-smbios-Add-a-linux-argument-to-apply-linux-modalias-.patch
+0076-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch
+0077-ubuntu-Update-the-linux-boot-protocol-version-check.patch
 ubuntu-resilient-boot-ignore-alternative-esps.patch
 ubuntu-resilient-boot-boot-order.patch
 ubuntu-speed-zsys-history.patch
-0082-yylex-Make-lexer-fatal-errors-actually-be-fatal.patch
-0083-safemath-Add-some-arithmetic-primitives-that-check-f.patch
-0084-calloc-Make-sure-we-always-have-an-overflow-checking.patch
-0085-calloc-Use-calloc-at-most-places.patch
-0086-malloc-Use-overflow-checking-primitives-where-we-do-.patch
-0087-iso9660-Don-t-leak-memory-on-realloc-failures.patch
-0088-font-Do-not-load-more-than-one-NAME-section.patch
-0089-gfxmenu-Fix-double-free-in-load_image.patch
-0090-lzma-Make-sure-we-don-t-dereference-past-array.patch
-0091-tftp-Do-not-use-priority-queue.patch
-0092-script-Remove-unused-fields-from-grub_script_functio.patch
-0093-script-Avoid-a-use-after-free-when-redefining-a-func.patch
-0094-hfsplus-fix-two-more-overflows.patch
-0095-lvm-fix-two-more-potential-data-dependent-alloc-over.patch
-0096-efi-fix-some-malformed-device-path-arithmetic-errors.patch
-0097-linuxefi-fail-kernel-validation-without-shim-protoco.patch
-0098-Fix-a-regression-caused-by-efi-fix-some-malformed-de.patch
-0099-efi-Fix-use-after-free-in-halt-reboot-path.patch
-0100-chainloader-Avoid-a-double-free-when-validation-fail.patch
-0101-relocator-Protect-grub_relocator_alloc_chunk_addr-in.patch
-0102-relocator-Protect-grub_relocator_alloc_chunk_align-m.patch
-0103-relocator-Fix-grub_relocator_alloc_chunk_align-top-m.patch
-0104-linux-loader-avoid-overflow-on-initrd-size-calculati.patch
-0105-linux-Fix-integer-overflows-in-initrd-size-handling.patch
-0106-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch
+0081-yylex-Make-lexer-fatal-errors-actually-be-fatal.patch
+0082-safemath-Add-some-arithmetic-primitives-that-check-f.patch
+0083-calloc-Make-sure-we-always-have-an-overflow-checking.patch
+0084-calloc-Use-calloc-at-most-places.patch
+0085-malloc-Use-overflow-checking-primitives-where-we-do-.patch
+0086-iso9660-Don-t-leak-memory-on-realloc-failures.patch
+0087-font-Do-not-load-more-than-one-NAME-section.patch
+0088-gfxmenu-Fix-double-free-in-load_image.patch
+0089-lzma-Make-sure-we-don-t-dereference-past-array.patch
+0090-tftp-Do-not-use-priority-queue.patch
+0091-script-Remove-unused-fields-from-grub_script_functio.patch
+0092-script-Avoid-a-use-after-free-when-redefining-a-func.patch
+0093-hfsplus-fix-two-more-overflows.patch
+0094-lvm-fix-two-more-potential-data-dependent-alloc-over.patch
+0095-efi-fix-some-malformed-device-path-arithmetic-errors.patch
+0096-linuxefi-fail-kernel-validation-without-shim-protoco.patch
+0097-Fix-a-regression-caused-by-efi-fix-some-malformed-de.patch
+0098-efi-Fix-use-after-free-in-halt-reboot-path.patch
+0099-chainloader-Avoid-a-double-free-when-validation-fail.patch
+0100-relocator-Protect-grub_relocator_alloc_chunk_addr-in.patch
+0101-relocator-Protect-grub_relocator_alloc_chunk_align-m.patch
+0102-relocator-Fix-grub_relocator_alloc_chunk_align-top-m.patch
+0103-linux-loader-avoid-overflow-on-initrd-size-calculati.patch
+0104-linux-Fix-integer-overflows-in-initrd-size-handling.patch
+0105-efilinux-Fix-integer-overflows-in-grub_cmd_initrd.patch
+ubuntu-flavour-order.patch
+ubuntu-dont-verify-loopback-images.patch
+ubuntu-recovery-dis_ucode_ldr.patch
diff --git a/debian/patches/skip-grub_cmd_set_date.patch b/debian/patches/skip-grub_cmd_set_date.patch
index 08e663b..6aa97f4 100644
--- a/debian/patches/skip-grub_cmd_set_date.patch
+++ b/debian/patches/skip-grub_cmd_set_date.patch
@@ -1,4 +1,4 @@
-From e37f5abdb9057be5d79ec34bab535ff059fa6b7f Mon Sep 17 00:00:00 2001
+From 0bd95cc9927bd92aa12a5fa9ba6ffd11ffc8b910 Mon Sep 17 00:00:00 2001
 From: Colin Watson <[e-mail]>
 Date: Sun, 28 Oct 2018 19:45:56 +0000
 Subject: Skip flaky grub_cmd_set_date test
@@ -12,7 +12,7 @@ Patch-Name: skip-grub_cmd_set_date.patch
  1 file changed, 3 insertions(+)
 
 diff --git a/tests/grub_cmd_set_date.in b/tests/grub_cmd_set_date.in
-index aac120a6c..1bb5be4ca 100644
+index aac120a6c5..1bb5be4ca7 100644
 --- a/tests/grub_cmd_set_date.in
 +++ b/tests/grub_cmd_set_date.in
 @@ -1,6 +1,9 @@
diff --git a/debian/patches/sleep-shift.patch b/debian/patches/sleep-shift.patch
index b739b45..9d1aae3 100644
--- a/debian/patches/sleep-shift.patch
+++ b/debian/patches/sleep-shift.patch
@@ -1,4 +1,4 @@
-From 8ff02f24d30da862a7ffe530aa2ff692ad8f1b06 Mon Sep 17 00:00:00 2001
+From e731dba24511ce3c9a06923db223ddd337798719 Mon Sep 17 00:00:00 2001
 From: Colin Watson <[e-mail]>
 Date: Mon, 13 Jan 2014 12:13:23 +0000
 Subject: Allow Shift to interrupt 'sleep --interruptible'
@@ -17,7 +17,7 @@ Patch-Name: sleep-shift.patch
  2 files changed, 45 insertions(+), 1 deletion(-)
 
 diff --git a/grub-core/commands/sleep.c b/grub-core/commands/sleep.c
-index e77e7900f..3906b1410 100644
+index e77e7900fa..3906b14103 100644
 --- a/grub-core/commands/sleep.c
 +++ b/grub-core/commands/sleep.c
 @@ -46,6 +46,31 @@ do_print (int n)
@@ -62,7 +62,7 @@ index e77e7900f..3906b1410 100644
  
    return 0;
 diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
-index d5e0c79a7..3611ee9ea 100644
+index d5e0c79a70..3611ee9ea7 100644
 --- a/grub-core/normal/menu.c
 +++ b/grub-core/normal/menu.c
 @@ -615,8 +615,27 @@ run_menu (grub_menu_t menu, int nested, int *auto_boot)
diff --git a/debian/patches/ubuntu-add-devicetree-command-support.patch b/debian/patches/ubuntu-add-devicetree-command-support.patch
index 316ed31..aa41aba 100644
--- a/debian/patches/ubuntu-add-devicetree-command-support.patch
+++ b/debian/patches/ubuntu-add-devicetree-command-support.patch
@@ -1,4 +1,4 @@
-From a30c330fb776934ef1dbaa9784960172650ecdfa Mon Sep 17 00:00:00 2001
+From 56ec016fe65a634c583cd347fc4e90992cb0c111 Mon Sep 17 00:00:00 2001
 From: Dimitri John Ledkov <[e-mail]>
 Date: Wed, 22 May 2019 19:57:29 +0100
 Subject: Add devicetree command, if a dtb is present.
@@ -14,10 +14,10 @@ Patch-Name: ubuntu-add-devicetree-command-support.patch
  1 file changed, 19 insertions(+)
 
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index a95992a77..d6937cfef 100644
+index af1e096bd6..bbf5d73e39 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
-@@ -240,6 +240,17 @@ EOF
+@@ -254,6 +254,17 @@ EOF
  EOF
          fi
      fi
@@ -35,7 +35,7 @@ index a95992a77..d6937cfef 100644
    fi
    sed "s/^/$submenu_indentation/" << EOF
  }
-@@ -378,6 +389,14 @@ while [ "x$list" != "x" ] ; do
+@@ -389,6 +400,14 @@ while [ "x$list" != "x" ] ; do
      gettext_printf "Found initrd image: %s\n" "$(echo $initrd_display)" >&2
    fi
  
diff --git a/debian/patches/ubuntu-add-initrd-less-boot-fallback.patch b/debian/patches/ubuntu-add-initrd-less-boot-fallback.patch
index 8778d34..e734a87 100644
--- a/debian/patches/ubuntu-add-initrd-less-boot-fallback.patch
+++ b/debian/patches/ubuntu-add-initrd-less-boot-fallback.patch
@@ -1,4 +1,4 @@
-From f44b20b94883a77b5f8ef8370bedb8457456907d Mon Sep 17 00:00:00 2001
+From 978947c3f5d769ee423c73418783ec4ef8f7ab3b Mon Sep 17 00:00:00 2001
 From: Chris Glass <[e-mail]>
 Date: Fri, 9 Mar 2018 13:47:07 +0100
 Subject: UBUNTU: Added initrd-less boot capabilities.
@@ -11,15 +11,15 @@ Signed-off-by: Steve Langasek <[e-mail]>
 Patch-Name: ubuntu-add-initrd-less-boot-fallback.patch
 ---
  Makefile.am                  |  3 ++
- configure.ac                 | 10 +++++++
- grub-initrd-fallback.service | 12 ++++++++
- util/grub.d/00_header.in     | 27 +++++++++++++++++
- util/grub.d/10_linux.in      | 56 +++++++++++++++++++++++++-----------
- 5 files changed, 91 insertions(+), 17 deletions(-)
+ configure.ac                 | 10 ++++++
+ grub-initrd-fallback.service | 12 +++++++
+ util/grub.d/00_header.in     | 27 ++++++++++++++
+ util/grub.d/10_linux.in      | 68 +++++++++++++++++++++++++++---------
+ 5 files changed, 104 insertions(+), 16 deletions(-)
  create mode 100644 grub-initrd-fallback.service
 
 diff --git a/Makefile.am b/Makefile.am
-index 1f4bb9b8c..e6a220711 100644
+index 1f4bb9b8c5..e6a220711e 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -473,6 +473,9 @@ ChangeLog: FORCE
@@ -33,7 +33,7 @@ index 1f4bb9b8c..e6a220711 100644
  
  syslinux_test: $(top_builddir)/config.status tests/syslinux/ubuntu10.04_grub.cfg
 diff --git a/configure.ac b/configure.ac
-index 883245553..1819188f9 100644
+index 883245553d..1819188f9f 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -305,6 +305,16 @@ AC_SUBST(grubdirname)
@@ -55,7 +55,7 @@ index 883245553..1819188f9 100644
  #
 diff --git a/grub-initrd-fallback.service b/grub-initrd-fallback.service
 new file mode 100644
-index 000000000..48778c9f7
+index 0000000000..48778c9f76
 --- /dev/null
 +++ b/grub-initrd-fallback.service
 @@ -0,0 +1,12 @@
@@ -72,7 +72,7 @@ index 000000000..48778c9f7
 +[Install]
 +WantedBy=multi-user.target rescue.target emergency.target
 diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
-index b7135b655..2642f66c5 100644
+index b7135b655f..2642f66c59 100644
 --- a/util/grub.d/00_header.in
 +++ b/util/grub.d/00_header.in
 @@ -50,6 +50,18 @@ if [ -s \$prefix/grubenv ]; then
@@ -117,7 +117,7 @@ index b7135b655..2642f66c5 100644
      cat <<EOF
  function recordfail {
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index aa9666e5a..13f39b9f6 100644
+index aa9666e5ad..af1e096bd6 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -118,6 +118,10 @@ if [ "$vt_handoff" = 1 ]; then
@@ -131,7 +131,7 @@ index aa9666e5a..13f39b9f6 100644
  linux_entry ()
  {
    os="$1"
-@@ -193,31 +197,49 @@ EOF
+@@ -193,31 +197,63 @@ EOF
  	linux	${rel_dirname}/${basename}.efi.signed root=${linux_root_device_thisversion} ro ${args}
  EOF
    else
@@ -143,6 +143,14 @@ index aa9666e5a..13f39b9f6 100644
 +        linux_root_device_thisversion="PARTUUID=${GRUB_FORCE_PARTUUID}"
 +    fi
 +    message="$(gettext_printf "Loading initial ramdisk ...")"
++    initrd_path=
++    for i in ${initrd}; do
++        initrd_path="${initrd_path} ${rel_dirname}/${i}"
++    done
++    initrd_path_only_early=
++    for i in ${initrd_early}; do
++        initrd_path_only_early="${initrd_path_only_early} ${rel_dirname}/${i}"
++    done
 +    if test -n "${initrd}" && [ x"$GRUB_FORCE_PARTUUID" != x ]; then
 +        sed "s/^/$submenu_indentation/" << EOF
 +	if [ "\${initrdfail}" = 1 ]; then
@@ -153,12 +161,18 @@ index aa9666e5a..13f39b9f6 100644
 +	  echo	'$(echo "$message" | grub_quote)'
 +EOF
 +        fi
-+
          sed "s/^/$submenu_indentation/" << EOF
 -        linux	${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
-+	  initrd	${rel_dirname}/${initrd}
++	  initrd	$(echo $initrd_path)
 +	else
 +	  linux	${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} panic=-1
++EOF
++        if [ -n "$initrd_path_only_early" ]; then
++          sed "s/^/$submenu_indentation/" << EOF
++	  initrd	$(echo $initrd_path_only_early)
++EOF
++        fi
++        sed "s/^/$submenu_indentation/" << EOF
 +	fi
 +	initrdfail
  EOF
@@ -188,10 +202,9 @@ index aa9666e5a..13f39b9f6 100644
 -      initrd_path="${initrd_path} ${rel_dirname}/${i}"
 -    done
 -    sed "s/^/$submenu_indentation/" << EOF
--	initrd	$(echo $initrd_path)
 +            fi
 +            sed "s/^/$submenu_indentation/" << EOF
-+	initrd	${rel_dirname}/${initrd}
+ 	initrd	$(echo $initrd_path)
  EOF
 +        fi
 +    fi
diff --git a/debian/patches/ubuntu-boot-from-multipath-dependent-symlink.patch b/debian/patches/ubuntu-boot-from-multipath-dependent-symlink.patch
index d8b8810..5e19f72 100644
--- a/debian/patches/ubuntu-boot-from-multipath-dependent-symlink.patch
+++ b/debian/patches/ubuntu-boot-from-multipath-dependent-symlink.patch
@@ -1,4 +1,4 @@
-From 4f4f4b1ce88642c1c13f12b425484906098590b5 Mon Sep 17 00:00:00 2001
+From c51cc4664ac67fcd7c3177ea6c6dd0d2c06c43e6 Mon Sep 17 00:00:00 2001
 From: Michael Hudson-Doyle <[e-mail]>
 Date: Tue, 6 Aug 2019 12:31:47 +1200
 Subject: UBUNTU: Boot from multipath-dependent symlink when / is multipathed.
@@ -16,7 +16,7 @@ Patch-Name: ubuntu-boot-from-multipath-dependent-symlink.patch
  1 file changed, 41 insertions(+)
 
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index d6937cfef..3eb0e6936 100644
+index bbf5d73e39..14a89ba13d 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -65,6 +65,47 @@ esac
diff --git a/debian/patches/ubuntu-clear-invalid-initrd-spacing.patch b/debian/patches/ubuntu-clear-invalid-initrd-spacing.patch
 deleted file mode 100644
index 14951f6..0000000
--- a/debian/patches/ubuntu-clear-invalid-initrd-spacing.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From a5307d00cee7f22074b89f393cb99c968f657ddb Mon Sep 17 00:00:00 2001
-From: Mathieu Trudel-Lapierre <[e-mail]>
-Date: Thu, 11 Jul 2019 09:07:47 -0400
-Subject: UBUNTU: Clear up incorrect spacing when not using early initrds
-
-Signed-off-by: Mathieu Trudel-Lapierre <[e-mail]>
-Patch-Name: ubuntu-clear-invalid-initrd-spacing.patch
----
- util/grub.d/10_linux.in | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 13f39b9f6..a95992a77 100644
---- a/util/grub.d/10_linux.in
-+++ b/util/grub.d/10_linux.in
-@@ -366,7 +366,10 @@ while [ "x$list" != "x" ] ; do
- 
-   initrd=
-   if test -n "${initrd_early}" || test -n "${initrd_real}"; then
--    initrd="${initrd_early} ${initrd_real}"
-+    initrd="${initrd_real}"
-+    if test -n "${initrd_early}"; then
-+        initrd="${initrd_early} ${initrd}"
-+    fi
- 
-     initrd_display=
-     for i in ${initrd}; do
diff --git a/debian/patches/ubuntu-dont-verify-loopback-images.patch b/debian/patches/ubuntu-dont-verify-loopback-images.patch
 new file mode 100644
index 0000000..d5a2a29
--- /dev/null
+++ b/debian/patches/ubuntu-dont-verify-loopback-images.patch
@@ -0,0 +1,37 @@
+From 7cb405298d3729d88b4e4ebc46ca1fc9b644bd6b Mon Sep 17 00:00:00 2001
+From: Chris Coulson <[e-mail]>
+Date: Mon, 1 Jun 2020 14:03:37 +0100
+Subject: UBUNTU: disk/loopback: Don't verify loopback images
+
+When a file is verified, the entire contents of the verified file are
+loaded in to memory and retained until the file handle is closed. A
+consequence of this is that opening a loopback image can incur a
+significant memory cost.
+
+As loopback devices are just another disk implementation, don't treat
+loopback images any differently to physical disk images, and skip
+verification of them. Files opened from the filesystem within a loopback
+image will still be passed to verifier modules where required.
+
+Signed-off-by: Chris Coulson <[e-mail]>
+LP: #1878541
+Forwarded: yes, https://lists.gnu.org/archive/html/grub-devel/2020-06/msg00002.html
+Patch-Name: ubuntu-dont-verify-loopback-images.patch
+---
+ grub-core/disk/loopback.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/grub-core/disk/loopback.c b/grub-core/disk/loopback.c
+index ccb4b167cc..210201d22d 100644
+--- a/grub-core/disk/loopback.c
++++ b/grub-core/disk/loopback.c
+@@ -86,7 +86,8 @@ grub_cmd_loopback (grub_extcmd_context_t ctxt, int argc, char **args)
+     return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));
+ 
+   file = grub_file_open (args[1], GRUB_FILE_TYPE_LOOPBACK
+-			 | GRUB_FILE_TYPE_NO_DECOMPRESS);
++			 | GRUB_FILE_TYPE_NO_DECOMPRESS |
++			 GRUB_FILE_TYPE_SKIP_SIGNATURE);
+   if (! file)
+     return grub_errno;
+ 
diff --git a/debian/patches/ubuntu-efi-allow-loopmount-chainload.patch b/debian/patches/ubuntu-efi-allow-loopmount-chainload.patch
index 94cd6db..ecc94e8 100644
--- a/debian/patches/ubuntu-efi-allow-loopmount-chainload.patch
+++ b/debian/patches/ubuntu-efi-allow-loopmount-chainload.patch
@@ -1,4 +1,4 @@
-From fdcce3de9327b0c8009054baa1ed13fb8572e1ac Mon Sep 17 00:00:00 2001
+From aa08be99df3978b44838e60f571fc965d9d963c4 Mon Sep 17 00:00:00 2001
 From: Dimitri John Ledkov <[e-mail]>
 Date: Wed, 27 Nov 2019 23:12:35 +0000
 Subject: UBUNTU: Allow chainloading EFI apps from loop mounts.
@@ -15,7 +15,7 @@ Patch-Name: ubuntu-efi-allow-loopmount-chainload.patch
  create mode 100644 include/grub/loopback.h
 
 diff --git a/grub-core/disk/loopback.c b/grub-core/disk/loopback.c
-index cdf9123fa..ccb4b167c 100644
+index cdf9123fa5..ccb4b167cc 100644
 --- a/grub-core/disk/loopback.c
 +++ b/grub-core/disk/loopback.c
 @@ -21,20 +21,13 @@
@@ -41,7 +41,7 @@ index cdf9123fa..ccb4b167c 100644
  static unsigned long last_id = 0;
  
 diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
-index ec80f415b..04e815c05 100644
+index ec80f415b8..04e815c052 100644
 --- a/grub-core/loader/efi/chainloader.c
 +++ b/grub-core/loader/efi/chainloader.c
 @@ -24,6 +24,7 @@
@@ -91,7 +91,7 @@ index ec80f415b..04e815c05 100644
  
 diff --git a/include/grub/loopback.h b/include/grub/loopback.h
 new file mode 100644
-index 000000000..3b9a9e32e
+index 0000000000..3b9a9e32e8
 --- /dev/null
 +++ b/include/grub/loopback.h
 @@ -0,0 +1,30 @@
diff --git a/debian/patches/ubuntu-efi-console-set-text-mode-as-needed.patch b/debian/patches/ubuntu-efi-console-set-text-mode-as-needed.patch
index b1efc2e..7d117b7 100644
--- a/debian/patches/ubuntu-efi-console-set-text-mode-as-needed.patch
+++ b/debian/patches/ubuntu-efi-console-set-text-mode-as-needed.patch
@@ -1,4 +1,4 @@
-From ab83d387cda5158fd4a3940dc067c55a6ee7f9f4 Mon Sep 17 00:00:00 2001
+From a097dd966d2a0073a3f2f30f868fae351b74fda4 Mon Sep 17 00:00:00 2001
 From: Hans de Goede <[e-mail]>
 Date: Tue, 6 Mar 2018 17:11:15 +0100
 Subject: UBUNTU: EFI: Do not set text-mode until we actually need it
@@ -15,7 +15,7 @@ Patch-Name: ubuntu-efi-console-set-text-mode-as-needed.patch
  1 file changed, 45 insertions(+), 23 deletions(-)
 
 diff --git a/grub-core/term/efi/console.c b/grub-core/term/efi/console.c
-index 4840cc59d..b61da7d0d 100644
+index 4840cc59d3..b61da7d0d0 100644
 --- a/grub-core/term/efi/console.c
 +++ b/grub-core/term/efi/console.c
 @@ -24,6 +24,11 @@
diff --git a/debian/patches/ubuntu-fix-lzma-decompressor-objcopy.patch b/debian/patches/ubuntu-fix-lzma-decompressor-objcopy.patch
index ff9a6b1..66834d3 100644
--- a/debian/patches/ubuntu-fix-lzma-decompressor-objcopy.patch
+++ b/debian/patches/ubuntu-fix-lzma-decompressor-objcopy.patch
@@ -1,4 +1,4 @@
-From 56715cae7b821ff8395078ff79a4a2ee937cb4db Mon Sep 17 00:00:00 2001
+From a0fdddf679ce3ac17b6de7a5c01c99ab598056ce Mon Sep 17 00:00:00 2001
 From: Mathieu Trudel-Lapierre <[e-mail]>
 Date: Wed, 3 Jul 2019 15:21:16 -0400
 Subject: UBUNTU: Have the lzma decompressor image only contain the .text
@@ -16,7 +16,7 @@ Signed-off-by: Mathieu Trudel-Lapierre <[e-mail]>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index 1731c53f0..33e75021d 100644
+index 1731c53f08..33e75021da 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
 @@ -547,7 +547,7 @@ image = {
diff --git a/debian/patches/ubuntu-flavour-order.patch b/debian/patches/ubuntu-flavour-order.patch
 new file mode 100644
index 0000000..30cc2bb
--- /dev/null
+++ b/debian/patches/ubuntu-flavour-order.patch
@@ -0,0 +1,61 @@
+From 8f4642af583c253259e8ca40d8aff776976d8d5d Mon Sep 17 00:00:00 2001
+From: Julian Andres Klode <[e-mail]>
+Date: Tue, 9 Jun 2020 11:50:23 +0200
+Subject: UBUNTU: Add GRUB_FLAVOUR_ORDER configuration item
+
+This allows you to specify flavours that will be preferred
+over other ones, and the order in which they are preferred
+- items in the list win over items not in the list, and items
+earlier in the list win over later ones.
+
+We still have to sort out storage of this, as we need to
+inject that from packages or the UA client and similar,
+and we can't just modify /etc/default/grub for that.
+
+LP: #1882663
+Patch-Name: ubuntu-flavour-order.patch
+---
+ util/grub-mkconfig.in     |  3 ++-
+ util/grub-mkconfig_lib.in | 15 +++++++++++++++
+ 2 files changed, 17 insertions(+), 1 deletion(-)
+
+diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
+index 72f1e25a03..6c8988fd60 100644
+--- a/util/grub-mkconfig.in
++++ b/util/grub-mkconfig.in
+@@ -260,7 +260,8 @@ export GRUB_DEFAULT \
+   GRUB_RECORDFAIL_TIMEOUT \
+   GRUB_RECOVERY_TITLE \
+   GRUB_FORCE_PARTUUID \
+-  GRUB_DISABLE_INITRD
++  GRUB_DISABLE_INITRD \
++  GRUB_FLAVOUR_ORDER
+ 
+ if test "x${grub_cfg}" != "x"; then
+   rm -f "${grub_cfg}.new"
+diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
+index fe6319abe0..7e2d1bc214 100644
+--- a/util/grub-mkconfig_lib.in
++++ b/util/grub-mkconfig_lib.in
+@@ -270,6 +270,21 @@ version_test_gt ()
+   if [ "x$version_test_gt_b" = "x" ] ; then
+     return 0
+   fi
++
++  # GRUB_FLAVOUR_ORDER is an ordered list of kernels, in decreasing
++  # priority. Any items in the list take precedence over other kernels,
++  # and earlier flavours are preferred over later ones.
++  for flavour in ${GRUB_FLAVOUR_ORDER:-}; do
++    version_test_gt_a_preferred=$(echo "$version_test_gt_a" | grep --  "-[0-9]*-$flavour\$")
++    version_test_gt_b_preferred=$(echo "$version_test_gt_b" | grep --  "-[0-9]*-$flavour\$")
++
++    if [ -n "$version_test_gt_a_preferred" -a -z "$version_test_gt_b_preferred" ] ; then
++      return 0
++    elif [ -z "$version_test_gt_a_preferred" -a -n "$version_test_gt_b_preferred" ] ; then
++      return 1
++    fi
++  done
++
+   case "$version_test_gt_a:$version_test_gt_b" in
+     *.old:*.old) ;;
+     *.old:*) version_test_gt_a="`echo "$version_test_gt_a" | sed -e 's/\.old$//'`" ; version_test_gt_cmp=gt ;;
diff --git a/debian/patches/ubuntu-grub-install-extra-removable.patch b/debian/patches/ubuntu-grub-install-extra-removable.patch
index 653d6db..d01763e 100644
--- a/debian/patches/ubuntu-grub-install-extra-removable.patch
+++ b/debian/patches/ubuntu-grub-install-extra-removable.patch
@@ -1,4 +1,4 @@
-From a2c29740e83520a037e3aa6e88c874ca0b5b991a Mon Sep 17 00:00:00 2001
+From 42b10df3ba7aff3f58b32cd43a0075a677fa8143 Mon Sep 17 00:00:00 2001
 From: Steve McIntyre <[e-mail]>
 Date: Wed, 3 Dec 2014 01:25:12 +0000
 Subject: UBUNTU: Add support for forcing EFI installation to the removable
@@ -23,7 +23,7 @@ Patch-Name: ubuntu-grub-install-extra-removable.patch
  1 file changed, 133 insertions(+), 2 deletions(-)
 
 diff --git a/util/grub-install.c b/util/grub-install.c
-index 64c292383..030464645 100644
+index 64c292383f..0304646453 100644
 --- a/util/grub-install.c
 +++ b/util/grub-install.c
 @@ -56,6 +56,7 @@
diff --git a/debian/patches/ubuntu-install-signed.patch b/debian/patches/ubuntu-install-signed.patch
index 688b5ab..626fedb 100644
--- a/debian/patches/ubuntu-install-signed.patch
+++ b/debian/patches/ubuntu-install-signed.patch
@@ -1,4 +1,4 @@
-From e66b6951c463ed36d7c3a8cff50c5dbdfa29e99a Mon Sep 17 00:00:00 2001
+From e1cc8a0711a700332db770c6e741d60ca2f9cce8 Mon Sep 17 00:00:00 2001
 From: Colin Watson <[e-mail]>
 Date: Mon, 13 Jan 2014 12:13:22 +0000
 Subject: UBUNTU: Install signed images if UEFI Secure Boot is enabled
@@ -19,7 +19,7 @@ Patch-Name: ubuntu-install-signed.patch
  1 file changed, 156 insertions(+), 59 deletions(-)
 
 diff --git a/util/grub-install.c b/util/grub-install.c
-index 3b4606eef..e1e40cf2b 100644
+index 3b4606eef1..e1e40cf2b5 100644
 --- a/util/grub-install.c
 +++ b/util/grub-install.c
 @@ -80,6 +80,7 @@ static char *label_color;
diff --git a/debian/patches/ubuntu-linuxefi.patch b/debian/patches/ubuntu-linuxefi.patch
index 74fec04..750cda6 100644
--- a/debian/patches/ubuntu-linuxefi.patch
+++ b/debian/patches/ubuntu-linuxefi.patch
@@ -1,4 +1,4 @@
-From 3451d405d55fd342aa581ecc23ee535ad533c61d Mon Sep 17 00:00:00 2001
+From 5d037853169fac31b3c0cfe7a6b6c4eb267879d3 Mon Sep 17 00:00:00 2001
 From: Matthew Garrett <[e-mail]>
 Date: Wed, 27 Feb 2019 12:20:48 -0500
 Subject: UBUNTU: Add support for linuxefi
@@ -358,7 +358,7 @@ Last-Update: 2018-12-07
  create mode 100644 include/grub/sparc64/linux.h
 
 diff --git a/grub-core/Makefile.am b/grub-core/Makefile.am
-index 3ea8e7ff4..c6ba5b2d7 100644
+index 3ea8e7ff45..c6ba5b2d76 100644
 --- a/grub-core/Makefile.am
 +++ b/grub-core/Makefile.am
 @@ -71,6 +71,7 @@ KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/command.h
@@ -370,7 +370,7 @@ index 3ea8e7ff4..c6ba5b2d7 100644
  KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/env_private.h
  KERNEL_HEADER_FILES += $(top_srcdir)/include/grub/err.h
 diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
-index aadb4cdff..1731c53f0 100644
+index aadb4cdff8..1731c53f08 100644
 --- a/grub-core/Makefile.core.def
 +++ b/grub-core/Makefile.core.def
 @@ -207,6 +207,7 @@ kernel = {
@@ -428,7 +428,7 @@ index aadb4cdff..1731c53f0 100644
    enable = i386_coreboot;
    enable = efi;
 diff --git a/grub-core/commands/iorw.c b/grub-core/commands/iorw.c
-index a0c164e54..41a7f3f04 100644
+index a0c164e54f..41a7f3f046 100644
 --- a/grub-core/commands/iorw.c
 +++ b/grub-core/commands/iorw.c
 @@ -23,6 +23,7 @@
@@ -460,7 +460,7 @@ index a0c164e54..41a7f3f04 100644
    grub_unregister_extcmd (cmd_read_word);
    grub_unregister_extcmd (cmd_read_dword);
 diff --git a/grub-core/commands/memrw.c b/grub-core/commands/memrw.c
-index 98769eadb..088cbe9e2 100644
+index 98769eadb3..088cbe9e2b 100644
 --- a/grub-core/commands/memrw.c
 +++ b/grub-core/commands/memrw.c
 @@ -22,6 +22,7 @@
@@ -492,7 +492,7 @@ index 98769eadb..088cbe9e2 100644
    grub_unregister_extcmd (cmd_read_word);
    grub_unregister_extcmd (cmd_read_dword);
 diff --git a/grub-core/kern/arm/coreboot/coreboot.S b/grub-core/kern/arm/coreboot/coreboot.S
-index a1104526c..70998c066 100644
+index a1104526c1..70998c066a 100644
 --- a/grub-core/kern/arm/coreboot/coreboot.S
 +++ b/grub-core/kern/arm/coreboot/coreboot.S
 @@ -42,3 +42,9 @@ FUNCTION(grub_armv7_get_timer_frequency)
@@ -506,7 +506,7 @@ index a1104526c..70998c066 100644
 +				  void *kernel_param);
 +
 diff --git a/grub-core/kern/dl.c b/grub-core/kern/dl.c
-index 074dfc3c6..d665c10fc 100644
+index 074dfc3c6f..d665c10fcc 100644
 --- a/grub-core/kern/dl.c
 +++ b/grub-core/kern/dl.c
 @@ -32,6 +32,7 @@
@@ -518,7 +518,7 @@ index 074dfc3c6..d665c10fc 100644
  /* Platforms where modules are in a readonly area of memory.  */
  #if defined(GRUB_MACHINE_QEMU)
 diff --git a/grub-core/kern/efi/efi.c b/grub-core/kern/efi/efi.c
-index 96204e39b..6e1ceb905 100644
+index 96204e39b9..6e1ceb9051 100644
 --- a/grub-core/kern/efi/efi.c
 +++ b/grub-core/kern/efi/efi.c
 @@ -273,34 +273,6 @@ grub_efi_get_variable (const char *var, const grub_efi_guid_t *guid,
@@ -557,7 +557,7 @@ index 96204e39b..6e1ceb905 100644
  
  /* Search the mods section from the PE32/PE32+ image. This code uses
 diff --git a/grub-core/kern/efi/mm.c b/grub-core/kern/efi/mm.c
-index b02fab1b1..a9e37108c 100644
+index b02fab1b10..a9e37108c6 100644
 --- a/grub-core/kern/efi/mm.c
 +++ b/grub-core/kern/efi/mm.c
 @@ -113,6 +113,38 @@ grub_efi_drop_alloc (grub_efi_physical_address_t address,
@@ -601,7 +601,7 @@ index b02fab1b1..a9e37108c 100644
  grub_efi_allocate_pages_real (grub_efi_physical_address_t address,
 diff --git a/grub-core/kern/efi/sb.c b/grub-core/kern/efi/sb.c
 new file mode 100644
-index 000000000..c14f401d7
+index 0000000000..c14f401d7e
 --- /dev/null
 +++ b/grub-core/kern/efi/sb.c
 @@ -0,0 +1,66 @@
@@ -672,7 +672,7 @@ index 000000000..c14f401d7
 +#endif
 +}
 diff --git a/grub-core/loader/arm64/linux.c b/grub-core/loader/arm64/linux.c
-index ef3e9f944..1a5296a60 100644
+index ef3e9f9444..1a5296a60c 100644
 --- a/grub-core/loader/arm64/linux.c
 +++ b/grub-core/loader/arm64/linux.c
 @@ -27,6 +27,7 @@
@@ -720,7 +720,7 @@ index ef3e9f944..1a5296a60 100644
    linux_args = grub_malloc (cmdline_size);
    if (!linux_args)
 diff --git a/grub-core/loader/efi/appleloader.c b/grub-core/loader/efi/appleloader.c
-index 74888c463..69c2a10d3 100644
+index 74888c463b..69c2a10d35 100644
 --- a/grub-core/loader/efi/appleloader.c
 +++ b/grub-core/loader/efi/appleloader.c
 @@ -24,6 +24,7 @@
@@ -751,7 +751,7 @@ index 74888c463..69c2a10d3 100644
    grub_unregister_command (cmd);
  }
 diff --git a/grub-core/loader/efi/chainloader.c b/grub-core/loader/efi/chainloader.c
-index cd92ea3f2..ec80f415b 100644
+index cd92ea3f24..ec80f415b8 100644
 --- a/grub-core/loader/efi/chainloader.c
 +++ b/grub-core/loader/efi/chainloader.c
 @@ -32,6 +32,9 @@
@@ -1701,7 +1701,7 @@ index cd92ea3f2..ec80f415b 100644
  
    return grub_errno;
 diff --git a/grub-core/loader/efi/fdt.c b/grub-core/loader/efi/fdt.c
-index f0c2d91be..5360e6c1f 100644
+index f0c2d91be2..5360e6c1f7 100644
 --- a/grub-core/loader/efi/fdt.c
 +++ b/grub-core/loader/efi/fdt.c
 @@ -25,6 +25,7 @@
@@ -1714,7 +1714,7 @@ index f0c2d91be..5360e6c1f 100644
  static void *fdt;
 diff --git a/grub-core/loader/efi/linux.c b/grub-core/loader/efi/linux.c
 new file mode 100644
-index 000000000..e372b26a1
+index 0000000000..e372b26a1b
 --- /dev/null
 +++ b/grub-core/loader/efi/linux.c
 @@ -0,0 +1,86 @@
@@ -1805,7 +1805,7 @@ index 000000000..e372b26a1
 +  return GRUB_ERR_BUG;
 +}
 diff --git a/grub-core/loader/i386/bsd.c b/grub-core/loader/i386/bsd.c
-index 3730ed382..5b9b92d6b 100644
+index 3730ed3824..5b9b92d6ba 100644
 --- a/grub-core/loader/i386/bsd.c
 +++ b/grub-core/loader/i386/bsd.c
 @@ -39,6 +39,7 @@
@@ -1838,7 +1838,7 @@ index 3730ed382..5b9b92d6b 100644
    grub_unregister_extcmd (cmd_netbsd);
 diff --git a/grub-core/loader/i386/efi/linux.c b/grub-core/loader/i386/efi/linux.c
 new file mode 100644
-index 000000000..6b6aef87f
+index 0000000000..6b6aef87f7
 --- /dev/null
 +++ b/grub-core/loader/i386/efi/linux.c
 @@ -0,0 +1,379 @@
@@ -2222,7 +2222,7 @@ index 000000000..6b6aef87f
 +  grub_unregister_command (cmd_initrd);
 +}
 diff --git a/grub-core/loader/i386/linux.c b/grub-core/loader/i386/linux.c
-index d0501e229..4328bcbdb 100644
+index d0501e2295..4328bcbdb0 100644
 --- a/grub-core/loader/i386/linux.c
 +++ b/grub-core/loader/i386/linux.c
 @@ -45,6 +45,7 @@ GRUB_MOD_LICENSE ("GPLv3+");
@@ -2390,7 +2390,7 @@ index d0501e229..4328bcbdb 100644
      {
        grub_error (GRUB_ERR_BAD_ARGUMENT, N_("filename expected"));
 diff --git a/grub-core/loader/i386/pc/linux.c b/grub-core/loader/i386/pc/linux.c
-index 47ea2945e..3866f048b 100644
+index 47ea2945e4..3866f048bb 100644
 --- a/grub-core/loader/i386/pc/linux.c
 +++ b/grub-core/loader/i386/pc/linux.c
 @@ -35,6 +35,7 @@
@@ -2503,7 +2503,7 @@ index 47ea2945e..3866f048b 100644
    grub_unregister_command (cmd_initrd);
  }
 diff --git a/grub-core/loader/multiboot.c b/grub-core/loader/multiboot.c
-index 4a98d7082..3e6ad166d 100644
+index 4a98d70825..3e6ad166dc 100644
 --- a/grub-core/loader/multiboot.c
 +++ b/grub-core/loader/multiboot.c
 @@ -50,6 +50,7 @@
@@ -2535,7 +2535,7 @@ index 4a98d7082..3e6ad166d 100644
    grub_unregister_command (cmd_module);
  }
 diff --git a/grub-core/loader/xnu.c b/grub-core/loader/xnu.c
-index 7f74d1d6f..e0f47e72b 100644
+index 7f74d1d6fc..e0f47e72b0 100644
 --- a/grub-core/loader/xnu.c
 +++ b/grub-core/loader/xnu.c
 @@ -34,6 +34,7 @@
@@ -2567,7 +2567,7 @@ index 7f74d1d6f..e0f47e72b 100644
    grub_unregister_command (cmd_resume);
  #endif
 diff --git a/include/grub/arm64/linux.h b/include/grub/arm64/linux.h
-index 4269adc6d..cc8174ccd 100644
+index 4269adc6da..cc8174ccdf 100644
 --- a/include/grub/arm64/linux.h
 +++ b/include/grub/arm64/linux.h
 @@ -20,6 +20,8 @@
@@ -2580,7 +2580,7 @@ index 4269adc6d..cc8174ccd 100644
  /* From linux/Documentation/arm64/booting.txt */
  struct linux_arm64_kernel_header
 diff --git a/include/grub/efi/efi.h b/include/grub/efi/efi.h
-index a237952b3..5b6387581 100644
+index a237952b37..5b63875812 100644
 --- a/include/grub/efi/efi.h
 +++ b/include/grub/efi/efi.h
 @@ -47,6 +47,9 @@ EXPORT_FUNC(grub_efi_allocate_fixed) (grub_efi_physical_address_t address,
@@ -2603,7 +2603,7 @@ index a237952b3..5b6387581 100644
  					     const grub_efi_device_path_t *dp2);
 diff --git a/include/grub/efi/linux.h b/include/grub/efi/linux.h
 new file mode 100644
-index 000000000..0033d9305
+index 0000000000..0033d9305a
 --- /dev/null
 +++ b/include/grub/efi/linux.h
 @@ -0,0 +1,31 @@
@@ -2639,7 +2639,7 @@ index 000000000..0033d9305
 +
 +#endif /* ! GRUB_EFI_LINUX_HEADER */
 diff --git a/include/grub/efi/pe32.h b/include/grub/efi/pe32.h
-index 0ed8781f0..a43adf274 100644
+index 0ed8781f03..a43adf2746 100644
 --- a/include/grub/efi/pe32.h
 +++ b/include/grub/efi/pe32.h
 @@ -223,7 +223,11 @@ struct grub_pe64_optional_header
@@ -2730,7 +2730,7 @@ index 0ed8781f0..a43adf274 100644
    grub_uint32_t page_rva;
 diff --git a/include/grub/efi/sb.h b/include/grub/efi/sb.h
 new file mode 100644
-index 000000000..9629fbb0f
+index 0000000000..9629fbb0f9
 --- /dev/null
 +++ b/include/grub/efi/sb.h
 @@ -0,0 +1,29 @@
@@ -2764,7 +2764,7 @@ index 000000000..9629fbb0f
 +
 +#endif /* ! GRUB_EFI_SB_HEADER */
 diff --git a/include/grub/i386/linux.h b/include/grub/i386/linux.h
-index ce30e7fb0..a093679cb 100644
+index ce30e7fb01..a093679cb8 100644
 --- a/include/grub/i386/linux.h
 +++ b/include/grub/i386/linux.h
 @@ -136,7 +136,12 @@ struct linux_i386_kernel_header
@@ -2783,13 +2783,13 @@ index ce30e7fb0..a093679cb 100644
    grub_uint64_t hardware_subarch_data;
 diff --git a/include/grub/ia64/linux.h b/include/grub/ia64/linux.h
 new file mode 100644
-index 000000000..e69de29bb
+index 0000000000..e69de29bb2
 diff --git a/include/grub/mips/linux.h b/include/grub/mips/linux.h
 new file mode 100644
-index 000000000..e69de29bb
+index 0000000000..e69de29bb2
 diff --git a/include/grub/powerpc/linux.h b/include/grub/powerpc/linux.h
 new file mode 100644
-index 000000000..e69de29bb
+index 0000000000..e69de29bb2
 diff --git a/include/grub/sparc64/linux.h b/include/grub/sparc64/linux.h
 new file mode 100644
-index 000000000..e69de29bb
+index 0000000000..e69de29bb2
diff --git a/debian/patches/ubuntu-mkconfig-leave-breadcrumbs.patch b/debian/patches/ubuntu-mkconfig-leave-breadcrumbs.patch
index 0f51703..8cebaa7 100644
--- a/debian/patches/ubuntu-mkconfig-leave-breadcrumbs.patch
+++ b/debian/patches/ubuntu-mkconfig-leave-breadcrumbs.patch
@@ -1,4 +1,4 @@
-From 7d3dea454253718d765c5dea62b893c5d5ef10ec Mon Sep 17 00:00:00 2001
+From 52a152744b026f62a412ae10d17f3756c44a687f Mon Sep 17 00:00:00 2001
 From: Mathieu Trudel-Lapierre <[e-mail]>
 Date: Fri, 14 Dec 2018 13:46:14 -0500
 Subject: UBUNTU: grub-mkconfig: leave a trace of what files were sourced to
@@ -11,7 +11,7 @@ Signed-off-by: Mathieu Trudel-Lapierre <[e-mail]>
  1 file changed, 2 insertions(+)
 
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index 29bdad0c1..72f1e25a0 100644
+index 29bdad0c12..72f1e25a03 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
 @@ -162,10 +162,12 @@ if [ "x${GRUB_EARLY_INITRD_LINUX_STOCK}" = "x" ]; then
diff --git a/debian/patches/ubuntu-recovery-dis_ucode_ldr.patch b/debian/patches/ubuntu-recovery-dis_ucode_ldr.patch
 new file mode 100644
index 0000000..cf5d1bd
--- /dev/null
+++ b/debian/patches/ubuntu-recovery-dis_ucode_ldr.patch
@@ -0,0 +1,84 @@
+From 398371c71cd52b6c48fa1d888903bd8a85682ec0 Mon Sep 17 00:00:00 2001
+From: Julian Andres Klode <[e-mail]>
+Date: Fri, 19 Jun 2020 12:57:19 +0200
+Subject: Pass dis_ucode_ldr to kernel for recovery mode
+
+In case of a botched microcode update, this allows people to
+easily roll back.
+
+It will of course break in the more unlikely event that you are
+missing a microcode update in your firmware that is needed to boot
+the system, but editing the entry to remove an option is easier than
+having to figure out the option and add it.
+
+LP: #1831789
+Patch-Name: ubuntu-recovery-dis_ucode_ldr.patch
+---
+ util/grub.d/10_linux.in     |  4 ++++
+ util/grub.d/10_linux_zfs.in | 24 +++++++++++++++---------
+ 2 files changed, 19 insertions(+), 9 deletions(-)
+
+diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
+index 14a89ba13d..49e627228f 100644
+--- a/util/grub.d/10_linux.in
++++ b/util/grub.d/10_linux.in
+@@ -334,6 +334,10 @@ case "$machine" in
+     *) GENKERNEL_ARCH="$machine" ;;
+ esac
+ 
++case "$GENKERNEL_ARCH" in
++  x86*) GRUB_CMDLINE_LINUX_RECOVERY="$GRUB_CMDLINE_LINUX_RECOVERY dis_ucode_ldr";;
++esac
++
+ prepare_boot_cache=
+ prepare_root_cache=
+ boot_device_id=
+diff --git a/util/grub.d/10_linux_zfs.in b/util/grub.d/10_linux_zfs.in
+index 712d832802..d9b79e29a7 100755
+--- a/util/grub.d/10_linux_zfs.in
++++ b/util/grub.d/10_linux_zfs.in
+@@ -41,6 +41,16 @@ imported_pools=""
+ MNTDIR="$(mktemp -d ${TMPDIR:-/tmp}/zfsmnt.XXXXXX)"
+ ZFSTMP="$(mktemp -d ${TMPDIR:-/tmp}/zfstmp.XXXXXX)"
+ 
++
++machine="$(uname -m)"
++case "${machine}" in
++    i?86) GENKERNEL_ARCH="x86" ;;
++    mips|mips64) GENKERNEL_ARCH="mips" ;;
++    mipsel|mips64el) GENKERNEL_ARCH="mipsel" ;;
++    arm*) GENKERNEL_ARCH="arm" ;;
++    *) GENKERNEL_ARCH="${machine}" ;;
++esac
++
+ RC=0
+ on_exit() {
+     # Restore initial zpool import state
+@@ -407,15 +417,6 @@ get_dataset_info() {
+         return
+     fi
+ 
+-    machine="$(uname -m)"
+-    case "${machine}" in
+-        i?86) GENKERNEL_ARCH="x86" ;;
+-        mips|mips64) GENKERNEL_ARCH="mips" ;;
+-        mipsel|mips64el) GENKERNEL_ARCH="mipsel" ;;
+-        arm*) GENKERNEL_ARCH="arm" ;;
+-        *) GENKERNEL_ARCH="${machine}" ;;
+-    esac
+-
+     initrd_list=""
+     kernel_list=""
+     list=$(find "${boot_dir}" -maxdepth 1 -type f -regex '.*/\(vmlinuz\|vmlinux\|kernel\)-.*')
+@@ -907,6 +908,11 @@ generate_grub_menu() {
+         GRUB_CMDLINE_LINUX_RECOVERY="${GRUB_CMDLINE_LINUX_RECOVERY} nomodeset"
+     fi
+ 
++    case "$GENKERNEL_ARCH" in
++        x86*) GRUB_CMDLINE_LINUX_RECOVERY="$GRUB_CMDLINE_LINUX_RECOVERY dis_ucode_ldr";;
++    esac
++
++
+     if [ "${vt_handoff}" = 1 ]; then
+         for word in ${GRUB_CMDLINE_LINUX_DEFAULT}; do
+             if [ "${word}" = splash ]; then
diff --git a/debian/patches/ubuntu-resilient-boot-boot-order.patch b/debian/patches/ubuntu-resilient-boot-boot-order.patch
index 89de3c2..cb682dc 100644
--- a/debian/patches/ubuntu-resilient-boot-boot-order.patch
+++ b/debian/patches/ubuntu-resilient-boot-boot-order.patch
@@ -1,4 +1,4 @@
-From dcd35364b7789ebb00a645b4fe35e0605ec141ef Mon Sep 17 00:00:00 2001
+From 7c39c2d340193862f27a1ef0af21653bc95b98b1 Mon Sep 17 00:00:00 2001
 From: Julian Andres Klode <[e-mail]>
 Date: Wed, 8 Apr 2020 11:05:25 +0200
 Subject: UBUNTU: efivar: Correctly handle boot order of multiple ESPs
@@ -30,7 +30,7 @@ Patch-Name: ubuntu-resilient-boot-boot-order.patch
  6 files changed, 59 insertions(+), 24 deletions(-)
 
 diff --git a/grub-core/osdep/basic/no_platform.c b/grub-core/osdep/basic/no_platform.c
-index d76c34c14..152a32873 100644
+index d76c34c148..152a328737 100644
 --- a/grub-core/osdep/basic/no_platform.c
 +++ b/grub-core/osdep/basic/no_platform.c
 @@ -31,7 +31,7 @@ grub_install_register_ieee1275 (int is_prep, const char *install_device,
@@ -43,7 +43,7 @@ index d76c34c14..152a32873 100644
  			   const char *efi_distributor)
  {
 diff --git a/grub-core/osdep/unix/efivar.c b/grub-core/osdep/unix/efivar.c
-index 41d39c448..d34df0f70 100644
+index 41d39c4489..d34df0f70f 100644
 --- a/grub-core/osdep/unix/efivar.c
 +++ b/grub-core/osdep/unix/efivar.c
 @@ -266,9 +266,10 @@ remove_from_boot_order (struct efi_variable *order, uint16_t num)
@@ -142,7 +142,7 @@ index 41d39c448..d34df0f70 100644
    grub_util_info ("setting EFI variable BootOrder");
    rc = set_efi_variable ("BootOrder", order);
 diff --git a/grub-core/osdep/unix/platform.c b/grub-core/osdep/unix/platform.c
-index b561174ea..a5267db68 100644
+index b561174ea9..a5267db68d 100644
 --- a/grub-core/osdep/unix/platform.c
 +++ b/grub-core/osdep/unix/platform.c
 @@ -76,13 +76,13 @@ get_ofpathname (const char *dev)
@@ -163,7 +163,7 @@ index b561174ea..a5267db68 100644
    grub_util_error ("%s",
  		   _("GRUB was not built with efivar support; "
 diff --git a/grub-core/osdep/windows/platform.c b/grub-core/osdep/windows/platform.c
-index e19a3d9a8..a3f738fb9 100644
+index e19a3d9a8a..a3f738fb9b 100644
 --- a/grub-core/osdep/windows/platform.c
 +++ b/grub-core/osdep/windows/platform.c
 @@ -208,7 +208,7 @@ set_efi_variable_bootn (grub_uint16_t n, void *in, grub_size_t len)
@@ -176,7 +176,7 @@ index e19a3d9a8..a3f738fb9 100644
  			   const char *efi_distributor)
  {
 diff --git a/include/grub/util/install.h b/include/grub/util/install.h
-index a521f1663..b2ed88e38 100644
+index a521f1663f..b2ed88e386 100644
 --- a/include/grub/util/install.h
 +++ b/include/grub/util/install.h
 @@ -219,15 +219,14 @@ grub_install_get_default_x86_platform (void);
@@ -204,7 +204,7 @@ index a521f1663..b2ed88e38 100644
  void
  grub_install_register_ieee1275 (int is_prep, const char *install_device,
 diff --git a/util/grub-install.c b/util/grub-install.c
-index bf8eb65b3..f408b1986 100644
+index bf8eb65b33..f408b19860 100644
 --- a/util/grub-install.c
 +++ b/util/grub-install.c
 @@ -2083,9 +2083,9 @@ main (int argc, char *argv[])
diff --git a/debian/patches/ubuntu-resilient-boot-ignore-alternative-esps.patch b/debian/patches/ubuntu-resilient-boot-ignore-alternative-esps.patch
index 7468ab0..95d72eb 100644
--- a/debian/patches/ubuntu-resilient-boot-ignore-alternative-esps.patch
+++ b/debian/patches/ubuntu-resilient-boot-ignore-alternative-esps.patch
@@ -1,4 +1,4 @@
-From 94189259ac860128abfc465fb3a920d60c63a85a Mon Sep 17 00:00:00 2001
+From b203098a49ebf172699dbb05b0cf88b2496dbdf7 Mon Sep 17 00:00:00 2001
 From: Julian Andres Klode <[e-mail]>
 Date: Fri, 3 Apr 2020 13:43:49 +0200
 Subject: UBUNTU: efivar: Ignore alternative ESPs
@@ -13,7 +13,7 @@ Patch-Name: ubuntu-resilient-boot-ignore-alternative-esps.patch
  1 file changed, 125 insertions(+), 5 deletions(-)
 
 diff --git a/grub-core/osdep/unix/efivar.c b/grub-core/osdep/unix/efivar.c
-index 4a58328b4..41d39c448 100644
+index 4a58328b42..41d39c4489 100644
 --- a/grub-core/osdep/unix/efivar.c
 +++ b/grub-core/osdep/unix/efivar.c
 @@ -37,9 +37,11 @@
diff --git a/debian/patches/ubuntu-shorter-version-info.patch b/debian/patches/ubuntu-shorter-version-info.patch
index 085b012..aaecb2c 100644
--- a/debian/patches/ubuntu-shorter-version-info.patch
+++ b/debian/patches/ubuntu-shorter-version-info.patch
@@ -1,4 +1,4 @@
-From 5fab34cd20e9617b29ed9b632b30cbdedc287e77 Mon Sep 17 00:00:00 2001
+From 05aa4e9758b7afb0866081795e1d7c139861ac97 Mon Sep 17 00:00:00 2001
 From: Julian Andres Klode <[e-mail]>
 Date: Thu, 8 Feb 2018 10:48:37 +0100
 Subject: UBUNTU: Show only upstream version, hide rest in package_version
@@ -17,7 +17,7 @@ Patch-Name: ubuntu-shorter-version-info.patch
  1 file changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
-index 0aa389fa1..d25a8212c 100644
+index 0aa389fa16..d25a8212c7 100644
 --- a/grub-core/normal/main.c
 +++ b/grub-core/normal/main.c
 @@ -208,7 +208,7 @@ grub_normal_init_page (struct grub_term_output *term,
diff --git a/debian/patches/ubuntu-skip-disk-by-id-lvm-pvm-uuid-entries.patch b/debian/patches/ubuntu-skip-disk-by-id-lvm-pvm-uuid-entries.patch
index ea91c04..ff4144b 100644
--- a/debian/patches/ubuntu-skip-disk-by-id-lvm-pvm-uuid-entries.patch
+++ b/debian/patches/ubuntu-skip-disk-by-id-lvm-pvm-uuid-entries.patch
@@ -1,4 +1,4 @@
-From c9bacc366d2c480e5185a2a71eff51d25b71e155 Mon Sep 17 00:00:00 2001
+From 48b735b222f112b8a9010ec2dbbf26818f8a1bf3 Mon Sep 17 00:00:00 2001
 From: Rafael David Tinoco <[e-mail]>
 Date: Mon, 7 Oct 2019 22:53:32 -0300
 Subject: Skip /dev/disk/by-id/lvm-pvm-uuid entries from device iteration
@@ -44,7 +44,7 @@ Patch-Name: ubuntu-skip-disk-by-id-lvm-pvm-uuid-entries.patch
  1 file changed, 3 insertions(+)
 
 diff --git a/util/deviceiter.c b/util/deviceiter.c
-index dddc50da7..ec9a6d0ab 100644
+index dddc50da7a..ec9a6d0ab4 100644
 --- a/util/deviceiter.c
 +++ b/util/deviceiter.c
 @@ -589,6 +589,9 @@ grub_util_iterate_devices (int (*hook) (const char *, int, void *), void *hook_d
diff --git a/debian/patches/ubuntu-speed-zsys-history.patch b/debian/patches/ubuntu-speed-zsys-history.patch
index 9d66b55..d3b8883 100644
--- a/debian/patches/ubuntu-speed-zsys-history.patch
+++ b/debian/patches/ubuntu-speed-zsys-history.patch
@@ -1,4 +1,4 @@
-From 4c7457bc4f7cd1a516a7e255476a086270a4dbe4 Mon Sep 17 00:00:00 2001
+From 9b0c52034a7de1c8749706ceef878b72f04ed115 Mon Sep 17 00:00:00 2001
 From: Didier Roche <[e-mail]>
 Date: Mon, 13 Apr 2020 15:12:21 +0200
 Subject: UBUNTU: Improve performance in bootmenu for zsys
@@ -17,10 +17,10 @@ Patch-Name: ubuntu-speed-zsys-history.patch
  1 file changed, 56 insertions(+), 21 deletions(-)
 
 diff --git a/util/grub.d/10_linux_zfs.in b/util/grub.d/10_linux_zfs.in
-index efdb8afae..d748f6a20 100755
+index 4c48abef01..712d832802 100755
 --- a/util/grub.d/10_linux_zfs.in
 +++ b/util/grub.d/10_linux_zfs.in
-@@ -800,9 +800,10 @@ zfs_linux_entry () {
+@@ -803,9 +803,10 @@ zfs_linux_entry () {
      boot_device="$5"
      initrd="$6"
      kernel="$7"
@@ -33,7 +33,7 @@ index efdb8afae..d748f6a20 100755
      submenu_indentation="$(printf %${submenu_level}s | tr " " "${grub_tab}")"
  
      echo "${submenu_indentation}menuentry '$(echo "${title}" | grub_quote)' ${CLASS} \${menuentry_id_option} 'gnulinux-${dataset}-${kernel_version}' {"
-@@ -837,7 +838,15 @@ zfs_linux_entry () {
+@@ -840,7 +841,15 @@ zfs_linux_entry () {
      echo "${submenu_indentation}	insmod gzio"
      echo "${submenu_indentation}	if [ \"\${grub_platform}\" = xen ]; then insmod xzio; insmod lzopio; fi"
  
@@ -50,7 +50,7 @@ index efdb8afae..d748f6a20 100755
  
      if [ "${quiet_boot}" = 0 ] || [ "${type}" != simple ]; then
          echo "${submenu_indentation}	echo $(gettext_printf "Loading Linux %s ..." ${kernel_version} | grub_quote)"
-@@ -905,6 +914,40 @@ generate_grub_menu() {
+@@ -908,6 +917,40 @@ generate_grub_menu() {
  
      print_menu_prologue
  
@@ -91,7 +91,7 @@ index efdb8afae..d748f6a20 100755
      # IFS is set to TAB (ASCII 0x09)
      echo "${menu_metadata}" |
      {
-@@ -935,7 +978,8 @@ generate_grub_menu() {
+@@ -938,7 +981,8 @@ generate_grub_menu() {
                      main_dataset_name="${name}"
                      main_dataset="${dataset}"
  
@@ -101,7 +101,7 @@ index efdb8afae..d748f6a20 100755
                      at_least_one_entry=1
                  ;;
                  advanced)
-@@ -951,12 +995,12 @@ generate_grub_menu() {
+@@ -954,12 +998,12 @@ generate_grub_menu() {
  
                      kernel_version=$(basename "${kernel}" | sed -e "s,^[^0-9]*-,,g")
                      title="$(gettext_printf "%s%s, with Linux %s" "${last_booted_kernel_marker}" "${name}" "${kernel_version}")"
@@ -116,7 +116,7 @@ index efdb8afae..d748f6a20 100755
                      fi
                      at_least_one_entry=1
                  ;;
-@@ -974,33 +1018,24 @@ generate_grub_menu() {
+@@ -977,33 +1021,24 @@ generate_grub_menu() {
                      fi
                      echo "	submenu '${title}' \${menuentry_id_option} 'gnulinux-history-${dataset}' {"
  
diff --git a/debian/patches/ubuntu-support-initrd-less-boot.patch b/debian/patches/ubuntu-support-initrd-less-boot.patch
index 7fad44d..c406fcc 100644
--- a/debian/patches/ubuntu-support-initrd-less-boot.patch
+++ b/debian/patches/ubuntu-support-initrd-less-boot.patch
@@ -1,4 +1,4 @@
-From f4cacdb13661017c82bf3414833ad351146dded2 Mon Sep 17 00:00:00 2001
+From bb9446cdc0550348631a98c1e2dde61a4f84b624 Mon Sep 17 00:00:00 2001
 From: Chris Glass <[e-mail]>
 Date: Thu, 10 Nov 2016 13:44:25 -0500
 Subject: UBUNTU: Added knobs to allow non-initrd boot config
@@ -18,7 +18,7 @@ Patch-Name: ubuntu-support-initrd-less-boot.patch
  4 files changed, 38 insertions(+), 4 deletions(-)
 
 diff --git a/docs/grub.info b/docs/grub.info
-index 7cc7d9212..f804b7800 100644
+index 7cc7d92128..f804b7800e 100644
 --- a/docs/grub.info
 +++ b/docs/grub.info
 @@ -1436,6 +1436,19 @@ it must be quoted.  For example:
@@ -42,7 +42,7 @@ index 7cc7d9212..f804b7800 100644
  existing configurations, but have better replacements:
  
 diff --git a/docs/grub.texi b/docs/grub.texi
-index 3ec35d315..1baa0fa20 100644
+index 3ec35d315a..1baa0fa20f 100644
 --- a/docs/grub.texi
 +++ b/docs/grub.texi
 @@ -1541,6 +1541,19 @@ This option sets the English text of the string that will be displayed in
@@ -66,7 +66,7 @@ index 3ec35d315..1baa0fa20 100644
  
  The following options are still accepted for compatibility with existing
 diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
-index 9c1da6477..29bdad0c1 100644
+index 9c1da64771..29bdad0c12 100644
 --- a/util/grub-mkconfig.in
 +++ b/util/grub-mkconfig.in
 @@ -256,7 +256,9 @@ export GRUB_DEFAULT \
@@ -81,7 +81,7 @@ index 9c1da6477..29bdad0c1 100644
  if test "x${grub_cfg}" != "x"; then
    rm -f "${grub_cfg}.new"
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index dff84edea..aa9666e5a 100644
+index dff84edea5..aa9666e5ad 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -193,11 +193,17 @@ EOF
diff --git a/debian/patches/ubuntu-temp-keep-auto-nvram.patch b/debian/patches/ubuntu-temp-keep-auto-nvram.patch
index 03cf74c..0638781 100644
--- a/debian/patches/ubuntu-temp-keep-auto-nvram.patch
+++ b/debian/patches/ubuntu-temp-keep-auto-nvram.patch
@@ -1,4 +1,4 @@
-From b2c200320645a00cfcb98017c9564716429723bc Mon Sep 17 00:00:00 2001
+From 5117bda061113e9a009bc1bb7cadd2a0f22c5efd Mon Sep 17 00:00:00 2001
 From: Mathieu Trudel-Lapierre <[e-mail]>
 Date: Tue, 16 Jul 2019 09:52:10 -0400
 Subject: UBUNTU: Temporarily keep grub-install's --auto-nvram.
@@ -10,7 +10,7 @@ Patch-Name: ubuntu-temp-keep-auto-nvram.patch
  1 file changed, 3 insertions(+)
 
 diff --git a/util/grub-install.c b/util/grub-install.c
-index 63462e4e0..bf8eb65b3 100644
+index 63462e4e09..bf8eb65b33 100644
 --- a/util/grub-install.c
 +++ b/util/grub-install.c
 @@ -98,6 +98,7 @@ enum
diff --git a/debian/patches/ubuntu-tpm-unknown-error-non-fatal.patch b/debian/patches/ubuntu-tpm-unknown-error-non-fatal.patch
index 3174186..cc60cb0 100644
--- a/debian/patches/ubuntu-tpm-unknown-error-non-fatal.patch
+++ b/debian/patches/ubuntu-tpm-unknown-error-non-fatal.patch
@@ -1,4 +1,4 @@
-From ec6589e2746dd882cc10122bad74b0e41074e23b Mon Sep 17 00:00:00 2001
+From 737eccc3c87fffcdd951520d77178c851adb5402 Mon Sep 17 00:00:00 2001
 From: Mathieu Trudel-Lapierre <[e-mail]>
 Date: Fri, 25 Oct 2019 10:25:04 -0400
 Subject: tpm: Pass unknown error as non-fatal, but debug print the error we
@@ -11,7 +11,7 @@ Patch-Name: ubuntu-tpm-unknown-error-non-fatal.patch
  1 file changed, 8 insertions(+), 4 deletions(-)
 
 diff --git a/grub-core/commands/efi/tpm.c b/grub-core/commands/efi/tpm.c
-index 32909c192..fdbaaee19 100644
+index 32909c192f..fdbaaee195 100644
 --- a/grub-core/commands/efi/tpm.c
 +++ b/grub-core/commands/efi/tpm.c
 @@ -155,7 +155,8 @@ grub_tpm1_execute (grub_efi_handle_t tpm_handle,
diff --git a/debian/patches/ubuntu-zfs-enhance-support.patch b/debian/patches/ubuntu-zfs-enhance-support.patch
index fc0ece7..c86ce3f 100644
--- a/debian/patches/ubuntu-zfs-enhance-support.patch
+++ b/debian/patches/ubuntu-zfs-enhance-support.patch
@@ -1,4 +1,4 @@
-From daa4db81742e0363c2b8c85b6a88ec3eca1efc19 Mon Sep 17 00:00:00 2001
+From bdc1aad90a89af51e043f5bf9dc84019ad2cb75b Mon Sep 17 00:00:00 2001
 From: Didier Roche <[e-mail]>
 Date: Fri, 12 Jul 2019 11:06:06 -0400
 Subject: UBUNTU: Enhance ZFS grub support
@@ -15,19 +15,19 @@ Subject: UBUNTU: Enhance ZFS grub support
 
 Author: Jean-Baptiste Lallement <[e-mail]>
 Author: Didier Roche <[e-mail]>
-Last-Update: 2019-07-26
+Last-Update: 2020-08-06
 Patch-Name: ubuntu-zfs-enhance-support.patch
 
 Signed-off-by: Didier Roche <[e-mail]>
 ---
  Makefile.util.def           |   7 +
  util/grub.d/10_linux.in     |   4 +
- util/grub.d/10_linux_zfs.in | 961 ++++++++++++++++++++++++++++++++++++
- 3 files changed, 972 insertions(+)
+ util/grub.d/10_linux_zfs.in | 964 ++++++++++++++++++++++++++++++++++++
+ 3 files changed, 975 insertions(+)
  create mode 100755 util/grub.d/10_linux_zfs.in
 
 diff --git a/Makefile.util.def b/Makefile.util.def
-index 969d32f00..bac85e284 100644
+index 969d32f009..bac85e2840 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
 @@ -482,6 +482,13 @@ script = {
@@ -45,7 +45,7 @@ index 969d32f00..bac85e284 100644
    name = '10_xnu';
    common = util/grub.d/10_xnu.in;
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 4532266be..a75096609 100644
+index 4532266be6..a75096609a 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -71,6 +71,10 @@ case x"$GRUB_FS" in
@@ -61,10 +61,10 @@ index 4532266be..a75096609 100644
  	LINUX_ROOT_DEVICE="ZFS=${rpool}${bootfs%/}"
 diff --git a/util/grub.d/10_linux_zfs.in b/util/grub.d/10_linux_zfs.in
 new file mode 100755
-index 000000000..f50e1231a
+index 0000000000..5ec65fa941
 --- /dev/null
 +++ b/util/grub.d/10_linux_zfs.in
-@@ -0,0 +1,961 @@
+@@ -0,0 +1,964 @@
 +#! /bin/sh
 +set -e
 +
@@ -470,7 +470,10 @@ index 000000000..f50e1231a
 +
 +    initrd_list=""
 +    kernel_list=""
-+    for linux in $(find "${boot_dir}" -maxdepth 1 -type f -regex '.*/\(vmlinuz\|vmlinux\|kernel\)-.*'|sort -V); do
++    list=$(find "${boot_dir}" -maxdepth 1 -type f -regex '.*/\(vmlinuz\|vmlinux\|kernel\)-.*')
++    while [ "x$list" != "x" ] ; do
++        linux=`version_find_latest $list`
++        list=`echo $list | tr ' ' '\n' | fgrep -vx "$linux" | tr '\n' ' '`
 +        if ! grub_file_is_not_garbage "${linux}" ; then
 +            continue
 +        fi
@@ -506,12 +509,12 @@ index 000000000..f50e1231a
 +
 +        rel_linux_dirname=$(make_system_path_relative_to_its_root "${linux_dirname}")
 +
-+        initrd_list="${rel_linux_dirname}/${initrd}|${initrd_list}"