Merge ~ubuntu-core-dev/grub/+git/ubuntu:focal-devel into ~ubuntu-core-dev/grub/+git/ubuntu:focal-security

[Dimitri John Ledkov]

[Dimitri John Ledkov (xnox)]

No idea if this makes any sense, but let's try.

[Julian Andres Klode (juliank)]

I want to rebase atop the security upload really, I think, otherwise it will just get super confusing

Unmerged commits

e972ed2... by Julian Andres Klode on 2020-06-26

releasing package grub2 version 2.04-1ubuntu26.2

ab1d190... by Julian Andres Klode on 2020-06-26

Merge branch 'ubuntu' into focal

d3c4b3f... by Julian Andres Klode on 2020-06-25

releasing package grub2 version 2.04-1ubuntu29

caea9bc... by Julian Andres Klode on 2020-06-25

change version to 2.04-1ubuntu29 (UNRELEASED)
debian/patches/ubuntu-flavour-order.patch: Remove debugging message and
export the variable so it actually works from /etc/default/grub.

3eb630e... by Julian Andres Klode on 2020-06-19

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

696a85a... by Chris Coulson on 2020-06-01

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 <email address hidden>
LP: #1878541
Forwarded: yes, https://lists.gnu.org/archive/html/grub-devel/2020-06/msg00002.html
Patch-Name: ubuntu-dont-verify-loopback-images.patch

2d23673... by Julian Andres Klode on 2020-06-09

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

8e1a6d7... by Julian Andres Klode on 2020-06-22

releasing package grub2 version 2.04-1ubuntu26.1

23e4dc8... by Julian Andres Klode on 2020-06-22

Merge branch 'ubuntu' into focal

7aa17ff... by Julian Andres Klode on 2020-06-19

releasing package grub2 version 2.04-1ubuntu28

diff --git a/debian/.git-dpm b/debian/.git-dpm
index 19c2663..3314490 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,6 +1,11 @@
 # see git-dpm(1) from git-dpm package
+<<<<<<< debian/.git-dpm
 ec83738b990d5008c23fa820edbfd9580df95e51
 ec83738b990d5008c23fa820edbfd9580df95e51
+=======
+3eb630e8f5eddee6e6160e1f2bb33ce7c5f8762b
+3eb630e8f5eddee6e6160e1f2bb33ce7c5f8762b
+>>>>>>> debian/.git-dpm
 578bb115fbd47e1c464696f1f8d6183e5443975d
 578bb115fbd47e1c464696f1f8d6183e5443975d
 grub2_2.04.orig.tar.xz
diff --git a/debian/changelog b/debian/changelog
index 4d388c9..c8c3d77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,4 @@
+<<<<<<< debian/changelog
 grub2 (2.04-1ubuntu26.1) focal; urgency=medium
 
   [ Julian Andres Klode ]
@@ -68,6 +69,32 @@ grub2 (2.04-1ubuntu26.1) focal; urgency=medium
     - Fail kernel validation if the shim protocol isn't available
 
  -- Chris Coulson <[e-mail]>  Mon, 20 Jul 2020 19:19:08 +0100
+=======
+grub2 (2.04-1ubuntu26.2) focal; urgency=medium
+
+  * debian/patches/ubuntu-flavour-order.patch: Remove debugging message and
+    export the variable so it actually works from /etc/default/grub.
+
+ -- Julian Andres Klode <[e-mail]>  Fri, 26 Jun 2020 12:43:20 +0200
+
+grub2 (2.04-1ubuntu26.1) focal; urgency=medium
+
+  * Move gettext patches out of git-dpm's way, so it does not delete them
+  * 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
+  * Merge changes from xnox to fix multiple initrds support (LP: #1878705)
+  * Pass dis_ucode_ldr to kernel for recovery mode (LP: #1831789)
+
+ -- Julian Andres Klode <[e-mail]>  Mon, 22 Jun 2020 13:30:46 +0200
+>>>>>>> debian/changelog
 
 grub2 (2.04-1ubuntu26) focal; urgency=medium
 
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..a05249e 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 c4966fe70800e0b8740bf45b02d63b51383d16ce 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..1b8e6eb 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 cd73cd59b7e210a3e66af073c649c162930989ad 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..5c44c1d 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 9a93d0f5a9216f71c4b9cbd041805911f476089e 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..4727ee1 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 b2c861f6f5da96ecda0ef8d962bb0fa804a56825 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/at_keyboard-module-init.patch b/debian/patches/at_keyboard-module-init.patch
index faafb46..5f504c8 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 fd386a087b6c64b28f1b80d03b35d7dcf552b143 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..e7eaa80 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 b4b380c0cbec13b3797a570e651e94cdc349bb2f 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..10062b6 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 9633a0226ecad133582225d7d5decd7f344b376d 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..dd56826 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 5376a44e70409088670de36d2ec82a1b48259cbd 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..075eeca 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 583bf554edc8aae87c44e7c9f984835b246e2f0b 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..2744692 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 552a1e20296307d177e1d679cae45bc78e101ecc 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..8c17a83 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 ffba11952bfc8ec3456d8b72db122550386a25ae 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..7318eaa 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 4dcbe95e3769a3665139e88cf1e179a802984493 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..0837cbd 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 43da93f26fcd81893edb2bbe10f87879a95dcbc5 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..1cd6507 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 5028184f2c8baf38d6849aa771c4d064fdcd0529 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..730ad3a 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 747f4241696cf526d68ff7de1efac04e1871567b 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..b844b7f 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 36785761748dd2ba5a38ec8c7fc412c8f875b0e2 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..f500a04 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 aa6426e9b8ce15c152af7d20686b26caadb2f28a 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..7248d6c 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 510fb7381e095c4212907e6b45e58f24e1889acf 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..826c65a 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 66ef92ba8ac39f919415f8687b8d0d9032c4a079 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..23b668f 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 e848d8754210095660b229f4639a065e8d96a0d0 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..d2002ff 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 34f053ee85aaa87fd40682a0f9c4e8c5858eeb55 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..1bd0bfc 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 406f5fc7f97315af793414d9e0ca14972bf6de0f 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..9cd2c60 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 c944dea56be3cce4bf4895a9915d35e75099f420 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..82991d0 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 d6fd02df51bc1b062fe70b2c4f6d33728d4219ee 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..c4cf303 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 70a2610a5392e09978ff7ccd9d69c942f60c522d 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..d666dae 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 dc18a17ef4f437fe9edfcf58747b70690e4ad32e 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..91dd7c4 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 7b60caf762c21f914b0d55b1d1b05dd54106e040 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..c94c436 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 15fb6fc1774a74152ad3070d2f14b88c00759577 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..6451234 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 65b6b662d6379652ca1bef129a686494669997a1 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..3706357 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 e5e64092c5dfeab61f1de2ef270827ba84f88c0e 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..0398786 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 797776285ad55df88f81c3c17656e03a187e7140 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..74eb2da 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 1033aefcd66f55eb12dedee2311b217beb1d9349 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..1450a08 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 615a0ad44bd41bf58f71ac391416ce9be1b4b7ae 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..13f8bfd 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 2015389b99c6a5eda55aa56a14dd4c65cf2a0d59 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..185d1d2 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 d8fd4cbf012ffc87a49de8cc28ed27c82f2eec1b 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..625cc4d 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 72835133813a3e59c58d6908a82cbc3f36adf34a 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..679db1f 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 01c7c86b01698ebf65fe99c34d2d79a39b76b4c1 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..3f64f55 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 3699711858d0aead05bc9a8e057022a90644cda6 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..6221e79 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 73f95865a1ffacb1e10e431e114baa67d36a27e1 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..bf711fc 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 b16ad7afe148eb58e1443bc6c20cd017cee3d7aa 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..c6b9a75 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 107663390a84f31f304094df29dd31a5584fa0b9 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..475d5b6 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 f80581266f3dc0cfa3be1e8cf2097f6cb880cfa4 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..69e2aa0 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 156930a8fe9525c51ec9608b8aff8c561dd6cc40 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..1610f03 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 81099f3b80801da7d591ab4ae14a568345c79119 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..e5dd415 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 ac0a158a4841bbc10112fa398d8ad65221792107 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..b5ddaff 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 f8150f56df7110d17b71cdacc79b451593f17feb 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..8ffbfa4 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 660f98d4548f4327954fba9410041a75893ad338 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..3f64825 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,13 +71,14 @@ 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
+<<<<<<< debian/patches/series
 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
@@ -104,3 +104,8 @@ ubuntu-speed-zsys-history.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
+=======
+ubuntu-flavour-order.patch
+ubuntu-dont-verify-loopback-images.patch
+ubuntu-recovery-dis_ucode_ldr.patch
+>>>>>>> debian/patches/series
diff --git a/debian/patches/skip-grub_cmd_set_date.patch b/debian/patches/skip-grub_cmd_set_date.patch
index 08e663b..31cae36 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 7dfe0ce472f7f0bdbe07cbe67958f06951c88f59 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..957f36b 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 dd350028f89cd033b832511d1888b49538ad2fd4 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..23b1a52 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 fa7f363abb70ecb9b6368221b9a3c408aa82e605 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..eee209a 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 ab2099f2c6c11ea45a6aadefeb785636477e7430 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..98571fd 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 704ab1283bad04e55ee7cd05281a17aa24e382c6 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..0531814
--- /dev/null
+++ b/debian/patches/ubuntu-dont-verify-loopback-images.patch
@@ -0,0 +1,37 @@
+From 696a85aae06675d927e2942a0d550e0e66078239 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..3d274cf 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 1cc5aadf105ba7037e2625ac22a89d7feea09109 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..66749d2 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 a7f1a5663f165025c279dd0a13cdec06d27f03e8 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..20a2db3 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 4dfa975de0c2289b33ab76f06e70b01583f2c56d 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..9308d1e
--- /dev/null
+++ b/debian/patches/ubuntu-flavour-order.patch
@@ -0,0 +1,61 @@
+From 2d236733ca4d74521cefab7fbf5e0f00967a028b 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..0f1b7a5 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 b87f13adb4998b9f68981636533b1d186030ac83 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..66f46b9 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 4d418a4d382eeb84eb67c8581819dd10894ed048 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..4cfdc1c 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 0e2ddafb154df1708801faef74aa4f2d40d55d35 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..451de30 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 f78a4044403841f4685924aa59cda87b8ffd4126 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..b387494
--- /dev/null
+++ b/debian/patches/ubuntu-recovery-dis_ucode_ldr.patch
@@ -0,0 +1,84 @@
+From 3eb630e8f5eddee6e6160e1f2bb33ce7c5f8762b 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..6583945 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 7a471059af0b7a511d51d43a26662c6424d88f56 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..f760c17 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 28f4a3b5e80e905042f5e68daa0150015fbdc470 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..850af42 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 91fe1e957877a6312ebb52d1d8f0f41ccc49cec9 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..7967a42 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 1c8dcce2384bc93646592c9a7a8f39aa6ce6e35b 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..5069a77 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 2180fd20a0bc9ddc2e43e2181959fb3f767dcabc 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..fe868ce 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 102bdde2eae083973dfa11de9f6289680bb03594 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..18842f2 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 698e98751624982b8367c1cfde1beeec0d4c5cea 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..a342e2b 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 5b7a5ab1640387e1d0275adc5acf16918218c6d9 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..2e98aaa 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 0f3f67aa23be0fa1ad5e0b4cda1c4a50225b8272 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
@@ -22,12 +22,12 @@ 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}"
-+        kernel_list="${rel_linux_dirname}/${linux_basename}|${kernel_list}"
++        initrd_list="${initrd_list}|${rel_linux_dirname}/${initrd}"
++        kernel_list="${kernel_list}|${rel_linux_dirname}/${linux_basename}"
 +    done
 +
-+    initrd_list="${initrd_list%|}"
-+    kernel_list="${kernel_list%|}"
++    initrd_list="${initrd_list#|}"
++    kernel_list="${kernel_list#|}"
 +
 +    initrd_device=$(${grub_probe} --target=device "${boot_dir}" | head -1)
 +
diff --git a/debian/patches/uefi-firmware-setup.patch b/debian/patches/uefi-firmware-setup.patch
index d6da9a6..4bf493d 100644
--- a/debian/patches/uefi-firmware-setup.patch
+++ b/debian/patches/uefi-firmware-setup.patch
@@ -1,4 +1,4 @@
-From 460169bfbef18f982e6bc0ad586c33aa0e14a316 Mon Sep 17 00:00:00 2001
+From e7b118f6f16c5c0b78d4963d8643d6afa72611f7 Mon Sep 17 00:00:00 2001
 From: Steve Langasek <[e-mail]>
 Date: Mon, 13 Jan 2014 12:13:12 +0000
 Subject: Output a menu entry for firmware setup on UEFI FastBoot systems
@@ -14,7 +14,7 @@ Patch-Name: uefi-firmware-setup.patch
  create mode 100644 util/grub.d/30_uefi-firmware.in
 
 diff --git a/Makefile.util.def b/Makefile.util.def
-index eec1924b0..ce133e694 100644
+index eec1924b0e..ce133e694e 100644
 --- a/Makefile.util.def
 +++ b/Makefile.util.def
 @@ -526,6 +526,12 @@ script = {
@@ -32,7 +32,7 @@ index eec1924b0..ce133e694 100644
    common = util/grub.d/40_custom.in;
 diff --git a/util/grub.d/30_uefi-firmware.in b/util/grub.d/30_uefi-firmware.in
 new file mode 100644
-index 000000000..3c9f533d8
+index 0000000000..3c9f533d8c
 --- /dev/null
 +++ b/util/grub.d/30_uefi-firmware.in
 @@ -0,0 +1,46 @@
diff --git a/debian/patches/uefi-secure-boot-cryptomount.patch b/debian/patches/uefi-secure-boot-cryptomount.patch
index 8478d5d..025fcc9 100644
--- a/debian/patches/uefi-secure-boot-cryptomount.patch
+++ b/debian/patches/uefi-secure-boot-cryptomount.patch
@@ -1,4 +1,4 @@
-From ed1f06e92f0a40b338d11723e0f4008c544ef712 Mon Sep 17 00:00:00 2001
+From 237dfe21cf3ec834fd96b65c4691f6386dd49680 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Herv=C3=A9=20Werner?= <[e-mail]>
 Date: Mon, 28 Jan 2019 17:24:23 +0100
 Subject: Fix setup on Secure Boot systems where cryptodisk is in use
@@ -19,7 +19,7 @@ Patch-Name: uefi-secure-boot-cryptomount.patch
  1 file changed, 17 insertions(+)
 
 diff --git a/util/grub-install.c b/util/grub-install.c
-index 030464645..4bad8de61 100644
+index 0304646453..4bad8de612 100644
 --- a/util/grub-install.c
 +++ b/util/grub-install.c
 @@ -1546,6 +1546,23 @@ main (int argc, char *argv[])
diff --git a/debian/patches/vsnprintf-upper-case-hex.patch b/debian/patches/vsnprintf-upper-case-hex.patch
index 4917b71..7385257 100644
--- a/debian/patches/vsnprintf-upper-case-hex.patch
+++ b/debian/patches/vsnprintf-upper-case-hex.patch
@@ -1,4 +1,4 @@
-From 9ec15b6602d6505bfc04dd1cd651a6c760ef4fe2 Mon Sep 17 00:00:00 2001
+From 03f49a87ffe7cbcf3737170935772818875ccbdb Mon Sep 17 00:00:00 2001
 From: Colin Watson <[e-mail]>
 Date: Mon, 11 Mar 2019 11:15:12 +0000
 Subject: Add %X to grub_vsnprintf_real and friends
@@ -18,7 +18,7 @@ Patch-Name: vsnprintf-upper-case-hex.patch
  1 file changed, 5 insertions(+), 2 deletions(-)
 
 diff --git a/grub-core/kern/misc.c b/grub-core/kern/misc.c
-index 3b633d51f..18cad5803 100644
+index 3b633d51f4..18cad5803b 100644
 --- a/grub-core/kern/misc.c
 +++ b/grub-core/kern/misc.c
 @@ -588,7 +588,7 @@ grub_divmod64 (grub_uint64_t n, grub_uint64_t d, grub_uint64_t *r)
diff --git a/debian/patches/vt-handoff.patch b/debian/patches/vt-handoff.patch
index 4db1344..75282e4 100644
--- a/debian/patches/vt-handoff.patch
+++ b/debian/patches/vt-handoff.patch
@@ -1,4 +1,4 @@
-From 378d93f9c2491ef7df49ed7ce3f413025998a0c0 Mon Sep 17 00:00:00 2001
+From 37413be89bbd62718b9a5f5295aa83ab6f7616b1 Mon Sep 17 00:00:00 2001
 From: Colin Watson <[e-mail]>
 Date: Mon, 13 Jan 2014 12:13:30 +0000
 Subject: Add configure option to use vt.handoff=7
@@ -19,7 +19,7 @@ Patch-Name: vt-handoff.patch
  3 files changed, 65 insertions(+), 2 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index dbc429ce0..e382c7480 100644
+index dbc429ce0a..e382c7480d 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1890,6 +1890,17 @@ else
@@ -41,7 +41,7 @@ index dbc429ce0..e382c7480 100644
  
  AC_SUBST([FONT_SOURCE])
 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
-index 09393c28e..cc2dd855a 100644
+index 09393c28ee..cc2dd855ab 100644
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
 @@ -24,6 +24,7 @@ ubuntu_recovery="@UBUNTU_RECOVERY@"
@@ -101,7 +101,7 @@ index 09393c28e..cc2dd855a 100644
  # FIXME: We need an interface to select vesafb in case efifb can't be used.
  if [ "x$GRUB_GFXPAYLOAD_LINUX" != x ] || [ "$gfxpayload_dynamic" = 0 ]; then
 diff --git a/util/grub.d/10_linux_zfs.in b/util/grub.d/10_linux_zfs.in
-index fc99f16e7..b636dc7bb 100755
+index 8cd7d12851..48a4e68976 100755
 --- a/util/grub.d/10_linux_zfs.in
 +++ b/util/grub.d/10_linux_zfs.in
 @@ -23,6 +23,7 @@ ubuntu_recovery="@UBUNTU_RECOVERY@"
@@ -112,7 +112,7 @@ index fc99f16e7..b636dc7bb 100755
  
  . "${pkgdatadir}/grub-mkconfig_lib"
  
-@@ -718,6 +719,23 @@ generate_grub_menu_metadata() {
+@@ -721,6 +722,23 @@ generate_grub_menu_metadata() {
  # Note:
  #   If 10_linux runs these part will be defined twice in grub configuration
  print_menu_prologue() {
@@ -136,7 +136,7 @@ index fc99f16e7..b636dc7bb 100755
      # Use ELILO's generic "efifb" when it's known to be available.
      # FIXME: We need an interface to select vesafb in case efifb can't be used.
      GRUB_GFXPAYLOAD_LINUX="${GRUB_GFXPAYLOAD_LINUX:-}"
-@@ -813,7 +831,7 @@ zfs_linux_entry () {
+@@ -816,7 +834,7 @@ zfs_linux_entry () {
  
      if ([ "${ubuntu_recovery}" = 0 ] || [ "${type}" != "recovery" ]) && \
          ([ "${GRUB_GFXPAYLOAD_LINUX}" != "" ] || [ "${gfxpayload_dynamic}" = 1 ]); then
@@ -145,7 +145,7 @@ index fc99f16e7..b636dc7bb 100755
      fi
  
      echo "${submenu_indentation}	insmod gzio"
-@@ -876,6 +894,14 @@ generate_grub_menu() {
+@@ -879,6 +897,14 @@ generate_grub_menu() {
          GRUB_CMDLINE_LINUX_RECOVERY="${GRUB_CMDLINE_LINUX_RECOVERY} nomodeset"
      fi
  
diff --git a/debian/patches/wubi-no-windows.patch b/debian/patches/wubi-no-windows.patch
index 29350c5..47385b7 100644
--- a/debian/patches/wubi-no-windows.patch
+++ b/debian/patches/wubi-no-windows.patch
@@ -1,4 +1,4 @@
-From e683b76e9278216d50c327b71dfbb7b722385503 Mon Sep 17 00:00:00 2001
+From 5d7c681c059de5af7dda174c8375c0cbfaa2d45a Mon Sep 17 00:00:00 2001
 From: Colin Watson <[e-mail]>
 Date: Mon, 13 Jan 2014 12:13:24 +0000
 Subject: Skip Windows os-prober entries on Wubi systems
@@ -19,7 +19,7 @@ Patch-Name: wubi-no-windows.patch
  1 file changed, 19 insertions(+)
 
 diff --git a/util/grub.d/30_os-prober.in b/util/grub.d/30_os-prober.in
-index b7e1147c4..271044f59 100644
+index b7e1147c41..271044f592 100644
 --- a/util/grub.d/30_os-prober.in
 +++ b/util/grub.d/30_os-prober.in
 @@ -110,6 +110,8 @@ EOF
diff --git a/debian/patches/zpool-full-device-name.patch b/debian/patches/zpool-full-device-name.patch
index 09e00fc..f23b055 100644
--- a/debian/patches/zpool-full-device-name.patch
+++ b/debian/patches/zpool-full-device-name.patch
@@ -1,4 +1,4 @@
-From 5bea13466c5d9048cf20139498dcba94f5500477 Mon Sep 17 00:00:00 2001
+From 45859b7aff8eb963b8dcb4b83c19579f8687a637 Mon Sep 17 00:00:00 2001
 From: Chad MILLER <[e-mail]>
 Date: Thu, 27 Oct 2016 17:15:07 -0400
 Subject: Tell zpool to emit full device names
@@ -20,7 +20,7 @@ Patch-Name: zpool-full-device-name.patch
  1 file changed, 1 insertion(+)
 
 diff --git a/grub-core/osdep/unix/getroot.c b/grub-core/osdep/unix/getroot.c
-index 46d7116c6..da102918d 100644
+index 46d7116c6e..da102918dc 100644
 --- a/grub-core/osdep/unix/getroot.c
 +++ b/grub-core/osdep/unix/getroot.c
 @@ -243,6 +243,7 @@ grub_util_find_root_devices_from_poolname (char *poolname)
diff --git a/grub-core/disk/loopback.c b/grub-core/disk/loopback.c
index ccb4b16..210201d 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/util/grub-mkconfig.in b/util/grub-mkconfig.in
index 72f1e25..6c8988f 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 fe6319a..7e2d1bc 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/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index 3eb0e69..49e6272 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -245,6 +245,14 @@ EOF
         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
@@ -255,11 +263,17 @@ EOF
 	  echo	'$(echo "$message" | grub_quote)'
 EOF
         fi
-
         sed "s/^/$submenu_indentation/" << EOF
-	  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
@@ -277,7 +291,7 @@ EOF
 EOF
             fi
             sed "s/^/$submenu_indentation/" << EOF
-	initrd	${rel_dirname}/${initrd}
+	initrd	$(echo $initrd_path)
 EOF
         fi
     fi
@@ -320,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=
@@ -418,10 +436,7 @@ while [ "x$list" != "x" ] ; do
 
   initrd=
   if test -n "${initrd_early}" || test -n "${initrd_real}"; then
-    initrd="${initrd_real}"
-    if test -n "${initrd_early}"; then
-        initrd="${initrd_early} ${initrd}"
-    fi
+    initrd="${initrd_early} ${initrd_real}"
 
     initrd_display=
     for i in ${initrd}; do
diff --git a/util/grub.d/10_linux_zfs.in b/util/grub.d/10_linux_zfs.in
index d748f6a..d9b79e2 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,18 +417,12 @@ 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=""
-    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
@@ -465,12 +469,12 @@ get_dataset_info() {
 
         rel_linux_dirname=$(make_system_path_relative_to_its_root "${linux_dirname}")
 
-        initrd_list="${rel_linux_dirname}/${initrd}|${initrd_list}"
-        kernel_list="${rel_linux_dirname}/${linux_basename}|${kernel_list}"
+        initrd_list="${initrd_list}|${rel_linux_dirname}/${initrd}"
+        kernel_list="${kernel_list}|${rel_linux_dirname}/${linux_basename}"
     done
 
-    initrd_list="${initrd_list%|}"
-    kernel_list="${kernel_list%|}"
+    initrd_list="${initrd_list#|}"
+    kernel_list="${kernel_list#|}"
 
     initrd_device=$(${grub_probe} --target=device "${boot_dir}" | head -1)
 
@@ -904,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