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

[Julian Andres Klode]

[Julian Andres Klode (juliank)]

It's not clear to me why git-dpm removed the patches it removed, but it seems they're not in the series file anyway?

[Julian Andres Klode (juliank)]

Ah I see, I should move the patches to debian/gettext-patches or something so that git-dpm does not override them. But that's for elsewhere :)

[Dimitri John Ledkov (xnox)]

Please revert/resurrect gettext patches.

[Dimitri John Ledkov (xnox)]

TODO test that latest entry points at the right kernel flavour in normal & zfs boots.

[Julian Andres Klode (juliank)]

Updated:

- moved the ZFS changes into the original ZFS patch
- fix unset variable errror if GRUB_FLAVOUR_ORDER is undefined
- Add version_test_gt to {a,b}_preferred variable names for scoping purposes

Still need to move the gettext bases in the base branch and rebase on that so they get preserved.

[Julian Andres Klode (juliank)]

Merged patch for bug 1878541

[Dimitri John Ledkov (xnox)]

Everything looks good.

Note to self: zfs script does not have multi-initrd support.

review: Approve

diff --git a/debian/.git-dpm b/debian/.git-dpm
index 61b8e87..ddf4fb0 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-4c7457bc4f7cd1a516a7e255476a086270a4dbe4
-4c7457bc4f7cd1a516a7e255476a086270a4dbe4
+0fb88755986ad4c14500e769b8543a9a72e718ef
+0fb88755986ad4c14500e769b8543a9a72e718ef
 578bb115fbd47e1c464696f1f8d6183e5443975d
 578bb115fbd47e1c464696f1f8d6183e5443975d
 grub2_2.04.orig.tar.xz
diff --git a/debian/changelog b/debian/changelog
index 21ff849..288abf6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,18 @@
 grub2 (2.04-1ubuntu27) UNRELEASED; 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
 
- -- Julian Andres Klode <[e-mail]>  Wed, 10 Jun 2020 11:22:22 +0200
+ -- Julian Andres Klode <[e-mail]>  Wed, 10 Jun 2020 11:25:07 +0200
 
 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/0075-uefi-firmware-rename-fwsetup-menuentry-to-UEFI-Firmw.patch
index 0bab37b..29f2134 100644
--- a/debian/patches/0075-uefi-firmware-rename-fwsetup-menuentry-to-UEFI-Firmw.patch
+++ b/debian/patches/0075-uefi-firmware-rename-fwsetup-menuentry-to-UEFI-Firmw.patch
@@ -1,4 +1,4 @@
-From 4d3c59dd378362f4e0e30aaaf77068bea97ebd24 Mon Sep 17 00:00:00 2001
+From 50fcc727d45fceafce6c3179bb0a86d87d8f48b2 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
diff --git a/debian/patches/0076-smbios-Add-a-linux-argument-to-apply-linux-modalias-.patch b/debian/patches/0076-smbios-Add-a-linux-argument-to-apply-linux-modalias-.patch
index c1bbac6..ca933d0 100644
--- a/debian/patches/0076-smbios-Add-a-linux-argument-to-apply-linux-modalias-.patch
+++ b/debian/patches/0076-smbios-Add-a-linux-argument-to-apply-linux-modalias-.patch
@@ -1,4 +1,4 @@
-From b7ae50d78035e0e73f5ea212fab7b728353c988b Mon Sep 17 00:00:00 2001
+From 9481917492c1e56ba5521c0f06f611208f1311e4 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
diff --git a/debian/patches/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch b/debian/patches/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch
index 13e098e..f5d8aff 100644
--- a/debian/patches/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch
+++ b/debian/patches/0077-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 7bfcf01a88ea45de97c2229d554397eef06b3482 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
diff --git a/debian/patches/0078-ubuntu-Update-the-linux-boot-protocol-version-check.patch b/debian/patches/0078-ubuntu-Update-the-linux-boot-protocol-version-check.patch
index 07e93a4..5e0b86f 100644
--- a/debian/patches/0078-ubuntu-Update-the-linux-boot-protocol-version-check.patch
+++ b/debian/patches/0078-ubuntu-Update-the-linux-boot-protocol-version-check.patch
@@ -1,4 +1,4 @@
-From 05c83490bed811e5dd5cde7c59bb56cc2db751d6 Mon Sep 17 00:00:00 2001
+From 27ae0a41bed84e5148ae5679e65762d33e9029f3 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.
diff --git a/debian/patches/at_keyboard-module-init.patch b/debian/patches/at_keyboard-module-init.patch
index faafb46..48b5c22 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
diff --git a/debian/patches/bash-completion-drop-have-checks.patch b/debian/patches/bash-completion-drop-have-checks.patch
index acb2021..c1371eb 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
diff --git a/debian/patches/blacklist-1440x900x32.patch b/debian/patches/blacklist-1440x900x32.patch
index 5043cf4..58c1c97 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
diff --git a/debian/patches/bootp-new-net_bootp6-command.patch b/debian/patches/bootp-new-net_bootp6-command.patch
index d53a2f2..ca00eec 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
diff --git a/debian/patches/bootp-process-dhcpack-http-boot.patch b/debian/patches/bootp-process-dhcpack-http-boot.patch
index 74e9508..c4947ac 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
diff --git a/debian/patches/cherrypick-lsefisystab-define-smbios3.patch b/debian/patches/cherrypick-lsefisystab-define-smbios3.patch
index 612fc32..2fdd3f7 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 7406e7234315d5bfeb70370437a4b50ba193ceac 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
diff --git a/debian/patches/cherrypick-lsefisystab-show-dtb.patch b/debian/patches/cherrypick-lsefisystab-show-dtb.patch
index 6516840..fb801a2 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 80960847b7b8b70a05dcaa9a09118077c385274e 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
diff --git a/debian/patches/cherrypick-smbios-module.patch b/debian/patches/cherrypick-smbios-module.patch
index 8bbe12b..9bc57ef 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 3a782757a22088878e13cf4e014585a828991579 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
diff --git a/debian/patches/default-grub-d.patch b/debian/patches/default-grub-d.patch
index dc61a66..c7716b9 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
diff --git a/debian/patches/efi-variable-storage-minimise-writes.patch b/debian/patches/efi-variable-storage-minimise-writes.patch
index 5078aa3..02daac9 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
diff --git a/debian/patches/efinet-set-dns-from-uefi-proto.patch b/debian/patches/efinet-set-dns-from-uefi-proto.patch
index e500199..b0fe194 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
diff --git a/debian/patches/efinet-set-network-from-uefi-devpath.patch b/debian/patches/efinet-set-network-from-uefi-devpath.patch
index bba19a4..fee310a 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
diff --git a/debian/patches/efinet-uefi-ipv6-pxe-support.patch b/debian/patches/efinet-uefi-ipv6-pxe-support.patch
index 531e73d..a3a46fe 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
diff --git a/debian/patches/gettext-quiet.patch b/debian/patches/gettext-quiet.patch
index 11a7e6f..beac00a 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
diff --git a/debian/patches/gfxpayload-dynamic.patch b/debian/patches/gfxpayload-dynamic.patch
index 8545c4d..5139e21 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
@@ -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 ec4b49d9d..8cd7d1285 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..1370b85 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
@@ -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 5ec65fa94..b24587f0a 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..8970fcc 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
diff --git a/debian/patches/ieee1275-clear-reset.patch b/debian/patches/ieee1275-clear-reset.patch
index 1d082e6..c6f68fa 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
diff --git a/debian/patches/ignore-grub_func_test-failures.patch b/debian/patches/ignore-grub_func_test-failures.patch
index cbbd3b2..e70ad7e 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
diff --git a/debian/patches/insmod-xzio-and-lzopio-on-xen.patch b/debian/patches/insmod-xzio-and-lzopio-on-xen.patch
index b16f128..9f9f5c4 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
@@ -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 4477fa606..4c48abef0 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..7c5d496 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
diff --git a/debian/patches/install-efi-ubuntu-flavours.patch b/debian/patches/install-efi-ubuntu-flavours.patch
index 31a74c8..17fb7dd 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
diff --git a/debian/patches/install-locale-langpack.patch b/debian/patches/install-locale-langpack.patch
index 4537170..2fc2972 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
diff --git a/debian/patches/install-powerpc-machtypes.patch b/debian/patches/install-powerpc-machtypes.patch
index bbc8d71..5cc9264 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
diff --git a/debian/patches/install-stage2-confusion.patch b/debian/patches/install-stage2-confusion.patch
index a803a68..92211df 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
diff --git a/debian/patches/maybe-quiet.patch b/debian/patches/maybe-quiet.patch
index 64e8d68..9c2ac34 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
@@ -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 bd4f1a212..3a0e6d103 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..fee02df 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
diff --git a/debian/patches/mkconfig-mid-upgrade.patch b/debian/patches/mkconfig-mid-upgrade.patch
index 248f6c3..5740e25 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
diff --git a/debian/patches/mkconfig-nonexistent-loopback.patch b/debian/patches/mkconfig-nonexistent-loopback.patch
index 9b8b848..dd84206 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
diff --git a/debian/patches/mkconfig-other-inits.patch b/debian/patches/mkconfig-other-inits.patch
index e7dd0b6..4f51332 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
diff --git a/debian/patches/mkconfig-recovery-title.patch b/debian/patches/mkconfig-recovery-title.patch
index 869fc30..510299c 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
@@ -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 48a4e6897..4477fa606 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
diff --git a/debian/patches/mkconfig-signed-kernel.patch b/debian/patches/mkconfig-signed-kernel.patch
index ea7cdb0..dadecb5 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
@@ -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 7f88e771e..bd4f1a212 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..e6fed48 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
@@ -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 de4d21590..7f88e771e 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..473f18c 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
@@ -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 b24587f0a..de4d21590 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
  
diff --git a/debian/patches/mkrescue-efi-modules.patch b/debian/patches/mkrescue-efi-modules.patch
index d0e0688..9131845 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
diff --git a/debian/patches/net-read-bracketed-ipv6-addr.patch b/debian/patches/net-read-bracketed-ipv6-addr.patch
index 9afab37..d41ae71 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
diff --git a/debian/patches/no-devicetree-if-secure-boot.patch b/debian/patches/no-devicetree-if-secure-boot.patch
index 2c20d15..de4bc73 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.
diff --git a/debian/patches/no-insmod-on-sb.patch b/debian/patches/no-insmod-on-sb.patch
index 95a34cd..0f1c334 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
diff --git a/debian/patches/ppc64el-disable-vsx.patch b/debian/patches/ppc64el-disable-vsx.patch
index ab96b1d..1bb2774 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
diff --git a/debian/patches/probe-fusionio.patch b/debian/patches/probe-fusionio.patch
index 7756341..9fa19bb 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
diff --git a/debian/patches/quick-boot-lvm.patch b/debian/patches/quick-boot-lvm.patch
index 23a9989..62748fd 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
diff --git a/debian/patches/quick-boot.patch b/debian/patches/quick-boot.patch
index 01fc3c9..96d5915 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
@@ -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 3a0e6d103..ec4b49d9d 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}' {"
  
diff --git a/debian/patches/restore-mkdevicemap.patch b/debian/patches/restore-mkdevicemap.patch
index 267b972..62e20f5 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
diff --git a/debian/patches/series b/debian/patches/series
index ff96a5c..8ebde51 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -79,3 +79,5 @@ cherrypick-lsefisystab-show-dtb.patch
 ubuntu-resilient-boot-ignore-alternative-esps.patch
 ubuntu-resilient-boot-boot-order.patch
 ubuntu-speed-zsys-history.patch
+ubuntu-flavour-order.patch
+ubuntu-dont-verify-loopback-images.patch
diff --git a/debian/patches/skip-grub_cmd_set_date.patch b/debian/patches/skip-grub_cmd_set_date.patch
index 08e663b..d8cd06d 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
diff --git a/debian/patches/sleep-shift.patch b/debian/patches/sleep-shift.patch
index b739b45..c84df1e 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'
diff --git a/debian/patches/ubuntu-add-devicetree-command-support.patch b/debian/patches/ubuntu-add-devicetree-command-support.patch
index 316ed31..b87b4c7 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 9410abc98d9b5f6bed3d7dee1872b254fee9a532 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.
diff --git a/debian/patches/ubuntu-add-initrd-less-boot-fallback.patch b/debian/patches/ubuntu-add-initrd-less-boot-fallback.patch
index 8778d34..1c7fe0c 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 29e19fc57024367d310d7efe8f5d1d0a14791960 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.
diff --git a/debian/patches/ubuntu-boot-from-multipath-dependent-symlink.patch b/debian/patches/ubuntu-boot-from-multipath-dependent-symlink.patch
index d8b8810..f25028b 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 1a8e3f4732ee883512333ae67eb773161f7e8e50 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.
diff --git a/debian/patches/ubuntu-clear-invalid-initrd-spacing.patch b/debian/patches/ubuntu-clear-invalid-initrd-spacing.patch
index 14951f6..49e287e 100644
--- a/debian/patches/ubuntu-clear-invalid-initrd-spacing.patch
+++ b/debian/patches/ubuntu-clear-invalid-initrd-spacing.patch
@@ -1,4 +1,4 @@
-From a5307d00cee7f22074b89f393cb99c968f657ddb Mon Sep 17 00:00:00 2001
+From 0791ce3b6a862e3e714a1bf226b81a21862d9b5b 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
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..2a5adee
--- /dev/null
+++ b/debian/patches/ubuntu-dont-verify-loopback-images.patch
@@ -0,0 +1,37 @@
+From 0fb88755986ad4c14500e769b8543a9a72e718ef 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 ccb4b167c..210201d22 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..ae46eb8 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 21aee738cf34184cc8546eafb31fac79b90f7409 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.
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..088e793 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
diff --git a/debian/patches/ubuntu-fix-lzma-decompressor-objcopy.patch b/debian/patches/ubuntu-fix-lzma-decompressor-objcopy.patch
index ff9a6b1..838d069 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 07c82b2e9d096aed1e826f4ae821ecad7029f0b3 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
diff --git a/debian/patches/ubuntu-flavour-order.patch b/debian/patches/ubuntu-flavour-order.patch
 new file mode 100644
index 0000000..5c894a4
--- /dev/null
+++ b/debian/patches/ubuntu-flavour-order.patch
@@ -0,0 +1,47 @@
+From 10e2a52f5516dafa5332d29aa1015d24b0db972d 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_lib.in | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/util/grub-mkconfig_lib.in b/util/grub-mkconfig_lib.in
+index fe6319abe..4a6614940 100644
+--- a/util/grub-mkconfig_lib.in
++++ b/util/grub-mkconfig_lib.in
+@@ -270,6 +270,22 @@ 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
++    echo "Checking flavour $flavour" >&2
++    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..c28149a 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
diff --git a/debian/patches/ubuntu-install-signed.patch b/debian/patches/ubuntu-install-signed.patch
index 688b5ab..2727829 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
diff --git a/debian/patches/ubuntu-linuxefi.patch b/debian/patches/ubuntu-linuxefi.patch
index 74fec04..4e7c912 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
diff --git a/debian/patches/ubuntu-mkconfig-leave-breadcrumbs.patch b/debian/patches/ubuntu-mkconfig-leave-breadcrumbs.patch
index 0f51703..488766d 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 4026f38f37e0ece7c8c6d0996c7fd181241010da 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
diff --git a/debian/patches/ubuntu-resilient-boot-boot-order.patch b/debian/patches/ubuntu-resilient-boot-boot-order.patch
index 89de3c2..c63016c 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 2d5c142c62c97d5934eababfb924882d4fe100ba 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
diff --git a/debian/patches/ubuntu-resilient-boot-ignore-alternative-esps.patch b/debian/patches/ubuntu-resilient-boot-ignore-alternative-esps.patch
index 7468ab0..773f806 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 f7e8057f7028b7f81e4d14d99bcd36583d9a419f 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
diff --git a/debian/patches/ubuntu-shorter-version-info.patch b/debian/patches/ubuntu-shorter-version-info.patch
index 085b012..1e40312 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
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..44c6f96 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 a6637aee3e6de2b2582a154f040b299ee66ba4fe 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
diff --git a/debian/patches/ubuntu-speed-zsys-history.patch b/debian/patches/ubuntu-speed-zsys-history.patch
index 9d66b55..052e09c 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 8ccf766784ffb18bc9d4d6f25e07c733dc96e281 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 4c48abef0..712d83280 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..894f0ac 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
diff --git a/debian/patches/ubuntu-temp-keep-auto-nvram.patch b/debian/patches/ubuntu-temp-keep-auto-nvram.patch
index 03cf74c..15a2895 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 1055f320d63fac13d951b6b26630b356b65c199c 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.
diff --git a/debian/patches/ubuntu-tpm-unknown-error-non-fatal.patch b/debian/patches/ubuntu-tpm-unknown-error-non-fatal.patch
index 3174186..62fb91a 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 232b4916c31086f2fac3ba02379c82633c52f25f 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
diff --git a/debian/patches/ubuntu-zfs-enhance-support.patch b/debian/patches/ubuntu-zfs-enhance-support.patch
index fc0ece7..a1d8a9e 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,8 +22,8 @@ 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
@@ -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 000000000..5ec65fa94
 --- /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..1f8f7c2 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
diff --git a/debian/patches/uefi-secure-boot-cryptomount.patch b/debian/patches/uefi-secure-boot-cryptomount.patch
index 8478d5d..3359006 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
diff --git a/debian/patches/vsnprintf-upper-case-hex.patch b/debian/patches/vsnprintf-upper-case-hex.patch
index 4917b71..2fdd255 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
diff --git a/debian/patches/vt-handoff.patch b/debian/patches/vt-handoff.patch
index 4db1344..ed64a62 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
@@ -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 8cd7d1285..48a4e6897 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..239d641 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
diff --git a/debian/patches/zpool-full-device-name.patch b/debian/patches/zpool-full-device-name.patch
index 09e00fc..6fe86f7 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
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_lib.in b/util/grub-mkconfig_lib.in
index fe6319a..4a66149 100644
--- a/util/grub-mkconfig_lib.in
+++ b/util/grub-mkconfig_lib.in
@@ -270,6 +270,22 @@ 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
+    echo "Checking flavour $flavour" >&2
+    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_zfs.in b/util/grub.d/10_linux_zfs.in
index d748f6a..712d832 100755
--- a/util/grub.d/10_linux_zfs.in
+++ b/util/grub.d/10_linux_zfs.in
@@ -418,7 +418,10 @@ get_dataset_info() {
 
     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 +468,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)