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

[Julian Andres Klode]

Merge xnox's changes for bug 1878705

[Dimitri John Ledkov (xnox)]

review: Approve

diff --git a/debian/.git-dpm b/debian/.git-dpm
index ddf4fb0..5f88132 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-0fb88755986ad4c14500e769b8543a9a72e718ef
-0fb88755986ad4c14500e769b8543a9a72e718ef
+f4ad1d67b9ce062fd85c0b5cd1c255260989c5a5
+f4ad1d67b9ce062fd85c0b5cd1c255260989c5a5
 578bb115fbd47e1c464696f1f8d6183e5443975d
 578bb115fbd47e1c464696f1f8d6183e5443975d
 grub2_2.04.orig.tar.xz
diff --git a/debian/changelog b/debian/changelog
index 288abf6..a4b4b57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ grub2 (2.04-1ubuntu27) UNRELEASED; urgency=medium
   * 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)
 
  -- Julian Andres Klode <[e-mail]>  Wed, 10 Jun 2020 11:25:07 +0200
 
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 95%
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 29f2134..7d68d0e 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 50fcc727d45fceafce6c3179bb0a86d87d8f48b2 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
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 98%
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 ca933d0..598f1ef 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 9481917492c1e56ba5521c0f06f611208f1311e4 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
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 99%
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 f5d8aff..2a9dedb 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 7bfcf01a88ea45de97c2229d554397eef06b3482 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
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 95%
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 5e0b86f..0710df7 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 27ae0a41bed84e5148ae5679e65762d33e9029f3 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.
diff --git a/debian/patches/cherrypick-lsefisystab-define-smbios3.patch b/debian/patches/cherrypick-lsefisystab-define-smbios3.patch
index 2fdd3f7..54a4af2 100644
--- a/debian/patches/cherrypick-lsefisystab-define-smbios3.patch
+++ b/debian/patches/cherrypick-lsefisystab-define-smbios3.patch
@@ -1,4 +1,4 @@
-From 7406e7234315d5bfeb70370437a4b50ba193ceac 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
diff --git a/debian/patches/cherrypick-lsefisystab-show-dtb.patch b/debian/patches/cherrypick-lsefisystab-show-dtb.patch
index fb801a2..5316ccb 100644
--- a/debian/patches/cherrypick-lsefisystab-show-dtb.patch
+++ b/debian/patches/cherrypick-lsefisystab-show-dtb.patch
@@ -1,4 +1,4 @@
-From 80960847b7b8b70a05dcaa9a09118077c385274e 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
diff --git a/debian/patches/cherrypick-smbios-module.patch b/debian/patches/cherrypick-smbios-module.patch
index 9bc57ef..1bd1192 100644
--- a/debian/patches/cherrypick-smbios-module.patch
+++ b/debian/patches/cherrypick-smbios-module.patch
@@ -1,4 +1,4 @@
-From 3a782757a22088878e13cf4e014585a828991579 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
diff --git a/debian/patches/series b/debian/patches/series
index 8ebde51..0b2eee6 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,10 +71,10 @@ 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
diff --git a/debian/patches/ubuntu-add-devicetree-command-support.patch b/debian/patches/ubuntu-add-devicetree-command-support.patch
index b87b4c7..e1c382a 100644
--- a/debian/patches/ubuntu-add-devicetree-command-support.patch
+++ b/debian/patches/ubuntu-add-devicetree-command-support.patch
@@ -1,4 +1,4 @@
-From 9410abc98d9b5f6bed3d7dee1872b254fee9a532 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 af1e096bd..bbf5d73e3 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 1c7fe0c..6ecadac 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 29e19fc57024367d310d7efe8f5d1d0a14791960 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,11 +11,11 @@ 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
@@ -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 aa9666e5a..af1e096bd 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 f25028b..627bb33 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 1a8e3f4732ee883512333ae67eb773161f7e8e50 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 bbf5d73e3..14a89ba13 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 49e287e..0000000
--- a/debian/patches/ubuntu-clear-invalid-initrd-spacing.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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
-
-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
index 2a5adee..1562a79 100644
--- a/debian/patches/ubuntu-dont-verify-loopback-images.patch
+++ b/debian/patches/ubuntu-dont-verify-loopback-images.patch
@@ -1,4 +1,4 @@
-From 0fb88755986ad4c14500e769b8543a9a72e718ef Mon Sep 17 00:00:00 2001
+From f4ad1d67b9ce062fd85c0b5cd1c255260989c5a5 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
diff --git a/debian/patches/ubuntu-efi-allow-loopmount-chainload.patch b/debian/patches/ubuntu-efi-allow-loopmount-chainload.patch
index ae46eb8..bd71729 100644
--- a/debian/patches/ubuntu-efi-allow-loopmount-chainload.patch
+++ b/debian/patches/ubuntu-efi-allow-loopmount-chainload.patch
@@ -1,4 +1,4 @@
-From 21aee738cf34184cc8546eafb31fac79b90f7409 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.
diff --git a/debian/patches/ubuntu-fix-lzma-decompressor-objcopy.patch b/debian/patches/ubuntu-fix-lzma-decompressor-objcopy.patch
index 838d069..d256d44 100644
--- a/debian/patches/ubuntu-fix-lzma-decompressor-objcopy.patch
+++ b/debian/patches/ubuntu-fix-lzma-decompressor-objcopy.patch
@@ -1,4 +1,4 @@
-From 07c82b2e9d096aed1e826f4ae821ecad7029f0b3 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
diff --git a/debian/patches/ubuntu-flavour-order.patch b/debian/patches/ubuntu-flavour-order.patch
index 5c894a4..47e8449 100644
--- a/debian/patches/ubuntu-flavour-order.patch
+++ b/debian/patches/ubuntu-flavour-order.patch
@@ -1,4 +1,4 @@
-From 10e2a52f5516dafa5332d29aa1015d24b0db972d Mon Sep 17 00:00:00 2001
+From d8b1fe38422efc282fd97790198b4a9a340a6bdf 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
diff --git a/debian/patches/ubuntu-mkconfig-leave-breadcrumbs.patch b/debian/patches/ubuntu-mkconfig-leave-breadcrumbs.patch
index 488766d..5f7e67d 100644
--- a/debian/patches/ubuntu-mkconfig-leave-breadcrumbs.patch
+++ b/debian/patches/ubuntu-mkconfig-leave-breadcrumbs.patch
@@ -1,4 +1,4 @@
-From 4026f38f37e0ece7c8c6d0996c7fd181241010da 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
diff --git a/debian/patches/ubuntu-resilient-boot-boot-order.patch b/debian/patches/ubuntu-resilient-boot-boot-order.patch
index c63016c..820bb39 100644
--- a/debian/patches/ubuntu-resilient-boot-boot-order.patch
+++ b/debian/patches/ubuntu-resilient-boot-boot-order.patch
@@ -1,4 +1,4 @@
-From 2d5c142c62c97d5934eababfb924882d4fe100ba 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
diff --git a/debian/patches/ubuntu-resilient-boot-ignore-alternative-esps.patch b/debian/patches/ubuntu-resilient-boot-ignore-alternative-esps.patch
index 773f806..cc7d80d 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 f7e8057f7028b7f81e4d14d99bcd36583d9a419f 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
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 44c6f96..5a47dd0 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 a6637aee3e6de2b2582a154f040b299ee66ba4fe 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
diff --git a/debian/patches/ubuntu-speed-zsys-history.patch b/debian/patches/ubuntu-speed-zsys-history.patch
index 052e09c..f3abe4a 100644
--- a/debian/patches/ubuntu-speed-zsys-history.patch
+++ b/debian/patches/ubuntu-speed-zsys-history.patch
@@ -1,4 +1,4 @@
-From 8ccf766784ffb18bc9d4d6f25e07c733dc96e281 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
diff --git a/debian/patches/ubuntu-temp-keep-auto-nvram.patch b/debian/patches/ubuntu-temp-keep-auto-nvram.patch
index 15a2895..96433a2 100644
--- a/debian/patches/ubuntu-temp-keep-auto-nvram.patch
+++ b/debian/patches/ubuntu-temp-keep-auto-nvram.patch
@@ -1,4 +1,4 @@
-From 1055f320d63fac13d951b6b26630b356b65c199c 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.
diff --git a/debian/patches/ubuntu-tpm-unknown-error-non-fatal.patch b/debian/patches/ubuntu-tpm-unknown-error-non-fatal.patch
index 62fb91a..81d3f8d 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 232b4916c31086f2fac3ba02379c82633c52f25f 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
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index 3eb0e69..14a89ba 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
@@ -418,10 +432,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