Merge ~juliank/grub/+git/ubuntu:ubuntu into ~ubuntu-core-dev/grub/+git/ubuntu:ubuntu
- Git
- lp:~juliank/grub/+git/ubuntu
- ubuntu
- Merge into ubuntu
Proposed by
Julian Andres Klode
Status: | Merged | ||||||||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
Merged at revision: | 4b1434475ee9a999fdcd896457960c1619c10711 | ||||||||||||||||
Proposed branch: | ~juliank/grub/+git/ubuntu:ubuntu | ||||||||||||||||
Merge into: | ~ubuntu-core-dev/grub/+git/ubuntu:ubuntu | ||||||||||||||||
Diff against target: |
481 lines (+74/-77) 26 files modified
debian/.git-dpm (+2/-2) debian/changelog (+1/-0) debian/patches/0074-uefi-firmware-rename-fwsetup-menuentry-to-UEFI-Firmw.patch (+1/-1) debian/patches/0075-smbios-Add-a-linux-argument-to-apply-linux-modalias-.patch (+1/-1) debian/patches/0076-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch (+1/-1) debian/patches/0077-ubuntu-Update-the-linux-boot-protocol-version-check.patch (+1/-1) debian/patches/cherrypick-lsefisystab-define-smbios3.patch (+1/-1) debian/patches/cherrypick-lsefisystab-show-dtb.patch (+1/-1) debian/patches/cherrypick-smbios-module.patch (+1/-1) debian/patches/series (+4/-5) debian/patches/ubuntu-add-devicetree-command-support.patch (+4/-4) debian/patches/ubuntu-add-initrd-less-boot-fallback.patch (+25/-12) debian/patches/ubuntu-boot-from-multipath-dependent-symlink.patch (+2/-2) debian/patches/ubuntu-dont-verify-loopback-images.patch (+1/-1) debian/patches/ubuntu-efi-allow-loopmount-chainload.patch (+1/-1) debian/patches/ubuntu-fix-lzma-decompressor-objcopy.patch (+1/-1) debian/patches/ubuntu-flavour-order.patch (+1/-1) debian/patches/ubuntu-mkconfig-leave-breadcrumbs.patch (+1/-1) debian/patches/ubuntu-resilient-boot-boot-order.patch (+1/-1) debian/patches/ubuntu-resilient-boot-ignore-alternative-esps.patch (+1/-1) debian/patches/ubuntu-skip-disk-by-id-lvm-pvm-uuid-entries.patch (+1/-1) debian/patches/ubuntu-speed-zsys-history.patch (+1/-1) debian/patches/ubuntu-temp-keep-auto-nvram.patch (+1/-1) debian/patches/ubuntu-tpm-unknown-error-non-fatal.patch (+1/-1) dev/null (+0/-27) util/grub.d/10_linux.in (+18/-7) |
||||||||||||||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Dimitri John Ledkov | Approve | ||
Review via email: mp+385521@code.launchpad.net |
Commit message
Description of the change
Merge xnox's changes for bug 1878705
To post a comment you must log in.
Revision history for this message
Dimitri John Ledkov (xnox) : | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | diff --git a/debian/.git-dpm b/debian/.git-dpm | |||
2 | index ddf4fb0..5f88132 100644 | |||
3 | --- a/debian/.git-dpm | |||
4 | +++ b/debian/.git-dpm | |||
5 | @@ -1,6 +1,6 @@ | |||
6 | 1 | # see git-dpm(1) from git-dpm package | 1 | # see git-dpm(1) from git-dpm package |
9 | 2 | 0fb88755986ad4c14500e769b8543a9a72e718ef | 2 | f4ad1d67b9ce062fd85c0b5cd1c255260989c5a5 |
10 | 3 | 0fb88755986ad4c14500e769b8543a9a72e718ef | 3 | f4ad1d67b9ce062fd85c0b5cd1c255260989c5a5 |
11 | 4 | 578bb115fbd47e1c464696f1f8d6183e5443975d | 4 | 578bb115fbd47e1c464696f1f8d6183e5443975d |
12 | 5 | 578bb115fbd47e1c464696f1f8d6183e5443975d | 5 | 578bb115fbd47e1c464696f1f8d6183e5443975d |
13 | 6 | grub2_2.04.orig.tar.xz | 6 | grub2_2.04.orig.tar.xz |
14 | diff --git a/debian/changelog b/debian/changelog | |||
15 | index 288abf6..a4b4b57 100644 | |||
16 | --- a/debian/changelog | |||
17 | +++ b/debian/changelog | |||
18 | @@ -11,6 +11,7 @@ grub2 (2.04-1ubuntu27) UNRELEASED; urgency=medium | |||
19 | 11 | * debian/patches/ubuntu-dont-verify-loopback-images.patch: | 11 | * debian/patches/ubuntu-dont-verify-loopback-images.patch: |
20 | 12 | - disk/loopback: Don't verify loopback images (LP: #1878541), | 12 | - disk/loopback: Don't verify loopback images (LP: #1878541), |
21 | 13 | Thanks to Chris Coulson for the patch | 13 | Thanks to Chris Coulson for the patch |
22 | 14 | * Merge changes from xnox to fix multiple initrds support (LP: #1878705) | ||
23 | 14 | 15 | ||
24 | 15 | -- Julian Andres Klode <juliank@ubuntu.com> Wed, 10 Jun 2020 11:25:07 +0200 | 16 | -- Julian Andres Klode <juliank@ubuntu.com> Wed, 10 Jun 2020 11:25:07 +0200 |
25 | 16 | 17 | ||
26 | 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 | |||
27 | 17 | similarity index 95% | 18 | similarity index 95% |
28 | 18 | rename from debian/patches/0075-uefi-firmware-rename-fwsetup-menuentry-to-UEFI-Firmw.patch | 19 | rename from debian/patches/0075-uefi-firmware-rename-fwsetup-menuentry-to-UEFI-Firmw.patch |
29 | 19 | rename to debian/patches/0074-uefi-firmware-rename-fwsetup-menuentry-to-UEFI-Firmw.patch | 20 | rename to debian/patches/0074-uefi-firmware-rename-fwsetup-menuentry-to-UEFI-Firmw.patch |
30 | index 29f2134..7d68d0e 100644 | |||
31 | --- a/debian/patches/0075-uefi-firmware-rename-fwsetup-menuentry-to-UEFI-Firmw.patch | |||
32 | +++ b/debian/patches/0074-uefi-firmware-rename-fwsetup-menuentry-to-UEFI-Firmw.patch | |||
33 | @@ -1,4 +1,4 @@ | |||
35 | 1 | From 50fcc727d45fceafce6c3179bb0a86d87d8f48b2 Mon Sep 17 00:00:00 2001 | 1 | From c4966fe70800e0b8740bf45b02d63b51383d16ce Mon Sep 17 00:00:00 2001 |
36 | 2 | From: Dimitri John Ledkov <xnox@ubuntu.com> | 2 | From: Dimitri John Ledkov <xnox@ubuntu.com> |
37 | 3 | Date: Mon, 24 Feb 2020 20:29:53 +0000 | 3 | Date: Mon, 24 Feb 2020 20:29:53 +0000 |
38 | 4 | Subject: uefi-firmware: rename fwsetup menuentry to UEFI Firmware Settings | 4 | Subject: uefi-firmware: rename fwsetup menuentry to UEFI Firmware Settings |
39 | 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 | |||
40 | 5 | similarity index 98% | 5 | similarity index 98% |
41 | 6 | rename from debian/patches/0076-smbios-Add-a-linux-argument-to-apply-linux-modalias-.patch | 6 | rename from debian/patches/0076-smbios-Add-a-linux-argument-to-apply-linux-modalias-.patch |
42 | 7 | rename to debian/patches/0075-smbios-Add-a-linux-argument-to-apply-linux-modalias-.patch | 7 | rename to debian/patches/0075-smbios-Add-a-linux-argument-to-apply-linux-modalias-.patch |
43 | index ca933d0..598f1ef 100644 | |||
44 | --- a/debian/patches/0076-smbios-Add-a-linux-argument-to-apply-linux-modalias-.patch | |||
45 | +++ b/debian/patches/0075-smbios-Add-a-linux-argument-to-apply-linux-modalias-.patch | |||
46 | @@ -1,4 +1,4 @@ | |||
48 | 1 | From 9481917492c1e56ba5521c0f06f611208f1311e4 Mon Sep 17 00:00:00 2001 | 1 | From cd73cd59b7e210a3e66af073c649c162930989ad Mon Sep 17 00:00:00 2001 |
49 | 2 | From: Julian Andres Klode <julian.klode@canonical.com> | 2 | From: Julian Andres Klode <julian.klode@canonical.com> |
50 | 3 | Date: Tue, 3 Mar 2020 16:06:34 +0100 | 3 | Date: Tue, 3 Mar 2020 16:06:34 +0100 |
51 | 4 | Subject: smbios: Add a --linux argument to apply linux modalias-like filtering | 4 | Subject: smbios: Add a --linux argument to apply linux modalias-like filtering |
52 | 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 | |||
53 | 5 | similarity index 99% | 5 | similarity index 99% |
54 | 6 | rename from debian/patches/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch | 6 | rename from debian/patches/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch |
55 | 7 | rename to debian/patches/0076-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch | 7 | rename to debian/patches/0076-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch |
56 | index f5d8aff..2a9dedb 100644 | |||
57 | --- a/debian/patches/0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch | |||
58 | +++ b/debian/patches/0076-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch | |||
59 | @@ -1,4 +1,4 @@ | |||
61 | 1 | From 7bfcf01a88ea45de97c2229d554397eef06b3482 Mon Sep 17 00:00:00 2001 | 1 | From 9a93d0f5a9216f71c4b9cbd041805911f476089e Mon Sep 17 00:00:00 2001 |
62 | 2 | From: Chris Coulson <chris.coulson@canonical.com> | 2 | From: Chris Coulson <chris.coulson@canonical.com> |
63 | 3 | Date: Wed, 11 Mar 2020 16:46:00 +0100 | 3 | Date: Wed, 11 Mar 2020 16:46:00 +0100 |
64 | 4 | Subject: ubuntu: Make the linux command in EFI grub always try EFI handover | 4 | Subject: ubuntu: Make the linux command in EFI grub always try EFI handover |
65 | 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 | |||
66 | 5 | similarity index 95% | 5 | similarity index 95% |
67 | 6 | rename from debian/patches/0078-ubuntu-Update-the-linux-boot-protocol-version-check.patch | 6 | rename from debian/patches/0078-ubuntu-Update-the-linux-boot-protocol-version-check.patch |
68 | 7 | rename to debian/patches/0077-ubuntu-Update-the-linux-boot-protocol-version-check.patch | 7 | rename to debian/patches/0077-ubuntu-Update-the-linux-boot-protocol-version-check.patch |
69 | index 5e0b86f..0710df7 100644 | |||
70 | --- a/debian/patches/0078-ubuntu-Update-the-linux-boot-protocol-version-check.patch | |||
71 | +++ b/debian/patches/0077-ubuntu-Update-the-linux-boot-protocol-version-check.patch | |||
72 | @@ -1,4 +1,4 @@ | |||
74 | 1 | From 27ae0a41bed84e5148ae5679e65762d33e9029f3 Mon Sep 17 00:00:00 2001 | 1 | From b2c861f6f5da96ecda0ef8d962bb0fa804a56825 Mon Sep 17 00:00:00 2001 |
75 | 2 | From: Chris Coulson <chris.coulson@canonical.com> | 2 | From: Chris Coulson <chris.coulson@canonical.com> |
76 | 3 | Date: Wed, 11 Mar 2020 16:46:41 +0100 | 3 | Date: Wed, 11 Mar 2020 16:46:41 +0100 |
77 | 4 | Subject: ubuntu: Update the linux boot protocol version check. | 4 | Subject: ubuntu: Update the linux boot protocol version check. |
78 | diff --git a/debian/patches/cherrypick-lsefisystab-define-smbios3.patch b/debian/patches/cherrypick-lsefisystab-define-smbios3.patch | |||
79 | index 2fdd3f7..54a4af2 100644 | |||
80 | --- a/debian/patches/cherrypick-lsefisystab-define-smbios3.patch | |||
81 | +++ b/debian/patches/cherrypick-lsefisystab-define-smbios3.patch | |||
82 | @@ -1,4 +1,4 @@ | |||
84 | 1 | From 7406e7234315d5bfeb70370437a4b50ba193ceac Mon Sep 17 00:00:00 2001 | 1 | From 552a1e20296307d177e1d679cae45bc78e101ecc Mon Sep 17 00:00:00 2001 |
85 | 2 | From: David Michael <fedora.dm0@gmail.com> | 2 | From: David Michael <fedora.dm0@gmail.com> |
86 | 3 | Date: Fri, 5 Jul 2019 08:47:02 -0400 | 3 | Date: Fri, 5 Jul 2019 08:47:02 -0400 |
87 | 4 | Subject: lsefisystab: Define SMBIOS3 entry point structures for EFI | 4 | Subject: lsefisystab: Define SMBIOS3 entry point structures for EFI |
88 | diff --git a/debian/patches/cherrypick-lsefisystab-show-dtb.patch b/debian/patches/cherrypick-lsefisystab-show-dtb.patch | |||
89 | index fb801a2..5316ccb 100644 | |||
90 | --- a/debian/patches/cherrypick-lsefisystab-show-dtb.patch | |||
91 | +++ b/debian/patches/cherrypick-lsefisystab-show-dtb.patch | |||
92 | @@ -1,4 +1,4 @@ | |||
94 | 1 | From 80960847b7b8b70a05dcaa9a09118077c385274e Mon Sep 17 00:00:00 2001 | 1 | From ffba11952bfc8ec3456d8b72db122550386a25ae Mon Sep 17 00:00:00 2001 |
95 | 2 | From: Heinrich Schuchardt <xypron.glpk@gmx.de> | 2 | From: Heinrich Schuchardt <xypron.glpk@gmx.de> |
96 | 3 | Date: Sat, 6 Jul 2019 11:11:02 +0200 | 3 | Date: Sat, 6 Jul 2019 11:11:02 +0200 |
97 | 4 | Subject: lsefisystab: Add support for device tree table | 4 | Subject: lsefisystab: Add support for device tree table |
98 | diff --git a/debian/patches/cherrypick-smbios-module.patch b/debian/patches/cherrypick-smbios-module.patch | |||
99 | index 9bc57ef..1bd1192 100644 | |||
100 | --- a/debian/patches/cherrypick-smbios-module.patch | |||
101 | +++ b/debian/patches/cherrypick-smbios-module.patch | |||
102 | @@ -1,4 +1,4 @@ | |||
104 | 1 | From 3a782757a22088878e13cf4e014585a828991579 Mon Sep 17 00:00:00 2001 | 1 | From 4dcbe95e3769a3665139e88cf1e179a802984493 Mon Sep 17 00:00:00 2001 |
105 | 2 | From: David Michael <fedora.dm0@gmail.com> | 2 | From: David Michael <fedora.dm0@gmail.com> |
106 | 3 | Date: Fri, 5 Jul 2019 08:47:09 -0400 | 3 | Date: Fri, 5 Jul 2019 08:47:09 -0400 |
107 | 4 | Subject: smbios: Add a module for retrieving SMBIOS information | 4 | Subject: smbios: Add a module for retrieving SMBIOS information |
108 | diff --git a/debian/patches/series b/debian/patches/series | |||
109 | index 8ebde51..0b2eee6 100644 | |||
110 | --- a/debian/patches/series | |||
111 | +++ b/debian/patches/series | |||
112 | @@ -62,7 +62,6 @@ ubuntu-shorter-version-info.patch | |||
113 | 62 | ubuntu-add-initrd-less-boot-fallback.patch | 62 | ubuntu-add-initrd-less-boot-fallback.patch |
114 | 63 | ubuntu-mkconfig-leave-breadcrumbs.patch | 63 | ubuntu-mkconfig-leave-breadcrumbs.patch |
115 | 64 | ubuntu-fix-lzma-decompressor-objcopy.patch | 64 | ubuntu-fix-lzma-decompressor-objcopy.patch |
116 | 65 | ubuntu-clear-invalid-initrd-spacing.patch | ||
117 | 66 | ubuntu-temp-keep-auto-nvram.patch | 65 | ubuntu-temp-keep-auto-nvram.patch |
118 | 67 | ubuntu-add-devicetree-command-support.patch | 66 | ubuntu-add-devicetree-command-support.patch |
119 | 68 | ubuntu-boot-from-multipath-dependent-symlink.patch | 67 | ubuntu-boot-from-multipath-dependent-symlink.patch |
120 | @@ -72,10 +71,10 @@ ubuntu-efi-allow-loopmount-chainload.patch | |||
121 | 72 | cherrypick-lsefisystab-define-smbios3.patch | 71 | cherrypick-lsefisystab-define-smbios3.patch |
122 | 73 | cherrypick-smbios-module.patch | 72 | cherrypick-smbios-module.patch |
123 | 74 | cherrypick-lsefisystab-show-dtb.patch | 73 | cherrypick-lsefisystab-show-dtb.patch |
128 | 75 | 0075-uefi-firmware-rename-fwsetup-menuentry-to-UEFI-Firmw.patch | 74 | 0074-uefi-firmware-rename-fwsetup-menuentry-to-UEFI-Firmw.patch |
129 | 76 | 0076-smbios-Add-a-linux-argument-to-apply-linux-modalias-.patch | 75 | 0075-smbios-Add-a-linux-argument-to-apply-linux-modalias-.patch |
130 | 77 | 0077-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch | 76 | 0076-ubuntu-Make-the-linux-command-in-EFI-grub-always-try.patch |
131 | 78 | 0078-ubuntu-Update-the-linux-boot-protocol-version-check.patch | 77 | 0077-ubuntu-Update-the-linux-boot-protocol-version-check.patch |
132 | 79 | ubuntu-resilient-boot-ignore-alternative-esps.patch | 78 | ubuntu-resilient-boot-ignore-alternative-esps.patch |
133 | 80 | ubuntu-resilient-boot-boot-order.patch | 79 | ubuntu-resilient-boot-boot-order.patch |
134 | 81 | ubuntu-speed-zsys-history.patch | 80 | ubuntu-speed-zsys-history.patch |
135 | diff --git a/debian/patches/ubuntu-add-devicetree-command-support.patch b/debian/patches/ubuntu-add-devicetree-command-support.patch | |||
136 | index b87b4c7..e1c382a 100644 | |||
137 | --- a/debian/patches/ubuntu-add-devicetree-command-support.patch | |||
138 | +++ b/debian/patches/ubuntu-add-devicetree-command-support.patch | |||
139 | @@ -1,4 +1,4 @@ | |||
141 | 1 | From 9410abc98d9b5f6bed3d7dee1872b254fee9a532 Mon Sep 17 00:00:00 2001 | 1 | From fa7f363abb70ecb9b6368221b9a3c408aa82e605 Mon Sep 17 00:00:00 2001 |
142 | 2 | From: Dimitri John Ledkov <xnox@ubuntu.com> | 2 | From: Dimitri John Ledkov <xnox@ubuntu.com> |
143 | 3 | Date: Wed, 22 May 2019 19:57:29 +0100 | 3 | Date: Wed, 22 May 2019 19:57:29 +0100 |
144 | 4 | Subject: Add devicetree command, if a dtb is present. | 4 | Subject: Add devicetree command, if a dtb is present. |
145 | @@ -14,10 +14,10 @@ Patch-Name: ubuntu-add-devicetree-command-support.patch | |||
146 | 14 | 1 file changed, 19 insertions(+) | 14 | 1 file changed, 19 insertions(+) |
147 | 15 | 15 | ||
148 | 16 | diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in | 16 | diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in |
150 | 17 | index a95992a77..d6937cfef 100644 | 17 | index af1e096bd..bbf5d73e3 100644 |
151 | 18 | --- a/util/grub.d/10_linux.in | 18 | --- a/util/grub.d/10_linux.in |
152 | 19 | +++ b/util/grub.d/10_linux.in | 19 | +++ b/util/grub.d/10_linux.in |
154 | 20 | @@ -240,6 +240,17 @@ EOF | 20 | @@ -254,6 +254,17 @@ EOF |
155 | 21 | EOF | 21 | EOF |
156 | 22 | fi | 22 | fi |
157 | 23 | fi | 23 | fi |
158 | @@ -35,7 +35,7 @@ index a95992a77..d6937cfef 100644 | |||
159 | 35 | fi | 35 | fi |
160 | 36 | sed "s/^/$submenu_indentation/" << EOF | 36 | sed "s/^/$submenu_indentation/" << EOF |
161 | 37 | } | 37 | } |
163 | 38 | @@ -378,6 +389,14 @@ while [ "x$list" != "x" ] ; do | 38 | @@ -389,6 +400,14 @@ while [ "x$list" != "x" ] ; do |
164 | 39 | gettext_printf "Found initrd image: %s\n" "$(echo $initrd_display)" >&2 | 39 | gettext_printf "Found initrd image: %s\n" "$(echo $initrd_display)" >&2 |
165 | 40 | fi | 40 | fi |
166 | 41 | 41 | ||
167 | diff --git a/debian/patches/ubuntu-add-initrd-less-boot-fallback.patch b/debian/patches/ubuntu-add-initrd-less-boot-fallback.patch | |||
168 | index 1c7fe0c..6ecadac 100644 | |||
169 | --- a/debian/patches/ubuntu-add-initrd-less-boot-fallback.patch | |||
170 | +++ b/debian/patches/ubuntu-add-initrd-less-boot-fallback.patch | |||
171 | @@ -1,4 +1,4 @@ | |||
173 | 1 | From 29e19fc57024367d310d7efe8f5d1d0a14791960 Mon Sep 17 00:00:00 2001 | 1 | From ab2099f2c6c11ea45a6aadefeb785636477e7430 Mon Sep 17 00:00:00 2001 |
174 | 2 | From: Chris Glass <chris.glass@canonical.com> | 2 | From: Chris Glass <chris.glass@canonical.com> |
175 | 3 | Date: Fri, 9 Mar 2018 13:47:07 +0100 | 3 | Date: Fri, 9 Mar 2018 13:47:07 +0100 |
176 | 4 | Subject: UBUNTU: Added initrd-less boot capabilities. | 4 | Subject: UBUNTU: Added initrd-less boot capabilities. |
177 | @@ -11,11 +11,11 @@ Signed-off-by: Steve Langasek <steve.langasek@canonical.com> | |||
178 | 11 | Patch-Name: ubuntu-add-initrd-less-boot-fallback.patch | 11 | Patch-Name: ubuntu-add-initrd-less-boot-fallback.patch |
179 | 12 | --- | 12 | --- |
180 | 13 | Makefile.am | 3 ++ | 13 | Makefile.am | 3 ++ |
186 | 14 | configure.ac | 10 +++++++ | 14 | configure.ac | 10 ++++++ |
187 | 15 | grub-initrd-fallback.service | 12 ++++++++ | 15 | grub-initrd-fallback.service | 12 +++++++ |
188 | 16 | util/grub.d/00_header.in | 27 +++++++++++++++++ | 16 | util/grub.d/00_header.in | 27 ++++++++++++++ |
189 | 17 | util/grub.d/10_linux.in | 56 +++++++++++++++++++++++++----------- | 17 | util/grub.d/10_linux.in | 68 +++++++++++++++++++++++++++--------- |
190 | 18 | 5 files changed, 91 insertions(+), 17 deletions(-) | 18 | 5 files changed, 104 insertions(+), 16 deletions(-) |
191 | 19 | create mode 100644 grub-initrd-fallback.service | 19 | create mode 100644 grub-initrd-fallback.service |
192 | 20 | 20 | ||
193 | 21 | diff --git a/Makefile.am b/Makefile.am | 21 | diff --git a/Makefile.am b/Makefile.am |
194 | @@ -117,7 +117,7 @@ index b7135b655..2642f66c5 100644 | |||
195 | 117 | cat <<EOF | 117 | cat <<EOF |
196 | 118 | function recordfail { | 118 | function recordfail { |
197 | 119 | diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in | 119 | diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in |
199 | 120 | index aa9666e5a..13f39b9f6 100644 | 120 | index aa9666e5a..af1e096bd 100644 |
200 | 121 | --- a/util/grub.d/10_linux.in | 121 | --- a/util/grub.d/10_linux.in |
201 | 122 | +++ b/util/grub.d/10_linux.in | 122 | +++ b/util/grub.d/10_linux.in |
202 | 123 | @@ -118,6 +118,10 @@ if [ "$vt_handoff" = 1 ]; then | 123 | @@ -118,6 +118,10 @@ if [ "$vt_handoff" = 1 ]; then |
203 | @@ -131,7 +131,7 @@ index aa9666e5a..13f39b9f6 100644 | |||
204 | 131 | linux_entry () | 131 | linux_entry () |
205 | 132 | { | 132 | { |
206 | 133 | os="$1" | 133 | os="$1" |
208 | 134 | @@ -193,31 +197,49 @@ EOF | 134 | @@ -193,31 +197,63 @@ EOF |
209 | 135 | linux ${rel_dirname}/${basename}.efi.signed root=${linux_root_device_thisversion} ro ${args} | 135 | linux ${rel_dirname}/${basename}.efi.signed root=${linux_root_device_thisversion} ro ${args} |
210 | 136 | EOF | 136 | EOF |
211 | 137 | else | 137 | else |
212 | @@ -143,6 +143,14 @@ index aa9666e5a..13f39b9f6 100644 | |||
213 | 143 | + linux_root_device_thisversion="PARTUUID=${GRUB_FORCE_PARTUUID}" | 143 | + linux_root_device_thisversion="PARTUUID=${GRUB_FORCE_PARTUUID}" |
214 | 144 | + fi | 144 | + fi |
215 | 145 | + message="$(gettext_printf "Loading initial ramdisk ...")" | 145 | + message="$(gettext_printf "Loading initial ramdisk ...")" |
216 | 146 | + initrd_path= | ||
217 | 147 | + for i in ${initrd}; do | ||
218 | 148 | + initrd_path="${initrd_path} ${rel_dirname}/${i}" | ||
219 | 149 | + done | ||
220 | 150 | + initrd_path_only_early= | ||
221 | 151 | + for i in ${initrd_early}; do | ||
222 | 152 | + initrd_path_only_early="${initrd_path_only_early} ${rel_dirname}/${i}" | ||
223 | 153 | + done | ||
224 | 146 | + if test -n "${initrd}" && [ x"$GRUB_FORCE_PARTUUID" != x ]; then | 154 | + if test -n "${initrd}" && [ x"$GRUB_FORCE_PARTUUID" != x ]; then |
225 | 147 | + sed "s/^/$submenu_indentation/" << EOF | 155 | + sed "s/^/$submenu_indentation/" << EOF |
226 | 148 | + if [ "\${initrdfail}" = 1 ]; then | 156 | + if [ "\${initrdfail}" = 1 ]; then |
227 | @@ -153,12 +161,18 @@ index aa9666e5a..13f39b9f6 100644 | |||
228 | 153 | + echo '$(echo "$message" | grub_quote)' | 161 | + echo '$(echo "$message" | grub_quote)' |
229 | 154 | +EOF | 162 | +EOF |
230 | 155 | + fi | 163 | + fi |
231 | 156 | + | ||
232 | 157 | sed "s/^/$submenu_indentation/" << EOF | 164 | sed "s/^/$submenu_indentation/" << EOF |
233 | 158 | - linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} | 165 | - linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} |
235 | 159 | + initrd ${rel_dirname}/${initrd} | 166 | + initrd $(echo $initrd_path) |
236 | 160 | + else | 167 | + else |
237 | 161 | + linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} panic=-1 | 168 | + linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} panic=-1 |
238 | 169 | +EOF | ||
239 | 170 | + if [ -n "$initrd_path_only_early" ]; then | ||
240 | 171 | + sed "s/^/$submenu_indentation/" << EOF | ||
241 | 172 | + initrd $(echo $initrd_path_only_early) | ||
242 | 173 | +EOF | ||
243 | 174 | + fi | ||
244 | 175 | + sed "s/^/$submenu_indentation/" << EOF | ||
245 | 162 | + fi | 176 | + fi |
246 | 163 | + initrdfail | 177 | + initrdfail |
247 | 164 | EOF | 178 | EOF |
248 | @@ -188,10 +202,9 @@ index aa9666e5a..13f39b9f6 100644 | |||
249 | 188 | - initrd_path="${initrd_path} ${rel_dirname}/${i}" | 202 | - initrd_path="${initrd_path} ${rel_dirname}/${i}" |
250 | 189 | - done | 203 | - done |
251 | 190 | - sed "s/^/$submenu_indentation/" << EOF | 204 | - sed "s/^/$submenu_indentation/" << EOF |
252 | 191 | - initrd $(echo $initrd_path) | ||
253 | 192 | + fi | 205 | + fi |
254 | 193 | + sed "s/^/$submenu_indentation/" << EOF | 206 | + sed "s/^/$submenu_indentation/" << EOF |
256 | 194 | + initrd ${rel_dirname}/${initrd} | 207 | initrd $(echo $initrd_path) |
257 | 195 | EOF | 208 | EOF |
258 | 196 | + fi | 209 | + fi |
259 | 197 | + fi | 210 | + fi |
260 | diff --git a/debian/patches/ubuntu-boot-from-multipath-dependent-symlink.patch b/debian/patches/ubuntu-boot-from-multipath-dependent-symlink.patch | |||
261 | index f25028b..627bb33 100644 | |||
262 | --- a/debian/patches/ubuntu-boot-from-multipath-dependent-symlink.patch | |||
263 | +++ b/debian/patches/ubuntu-boot-from-multipath-dependent-symlink.patch | |||
264 | @@ -1,4 +1,4 @@ | |||
266 | 1 | From 1a8e3f4732ee883512333ae67eb773161f7e8e50 Mon Sep 17 00:00:00 2001 | 1 | From 704ab1283bad04e55ee7cd05281a17aa24e382c6 Mon Sep 17 00:00:00 2001 |
267 | 2 | From: Michael Hudson-Doyle <michael.hudson@canonical.com> | 2 | From: Michael Hudson-Doyle <michael.hudson@canonical.com> |
268 | 3 | Date: Tue, 6 Aug 2019 12:31:47 +1200 | 3 | Date: Tue, 6 Aug 2019 12:31:47 +1200 |
269 | 4 | Subject: UBUNTU: Boot from multipath-dependent symlink when / is multipathed. | 4 | Subject: UBUNTU: Boot from multipath-dependent symlink when / is multipathed. |
270 | @@ -16,7 +16,7 @@ Patch-Name: ubuntu-boot-from-multipath-dependent-symlink.patch | |||
271 | 16 | 1 file changed, 41 insertions(+) | 16 | 1 file changed, 41 insertions(+) |
272 | 17 | 17 | ||
273 | 18 | diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in | 18 | diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in |
275 | 19 | index d6937cfef..3eb0e6936 100644 | 19 | index bbf5d73e3..14a89ba13 100644 |
276 | 20 | --- a/util/grub.d/10_linux.in | 20 | --- a/util/grub.d/10_linux.in |
277 | 21 | +++ b/util/grub.d/10_linux.in | 21 | +++ b/util/grub.d/10_linux.in |
278 | 22 | @@ -65,6 +65,47 @@ esac | 22 | @@ -65,6 +65,47 @@ esac |
279 | diff --git a/debian/patches/ubuntu-clear-invalid-initrd-spacing.patch b/debian/patches/ubuntu-clear-invalid-initrd-spacing.patch | |||
280 | 23 | deleted file mode 100644 | 23 | deleted file mode 100644 |
281 | index 49e287e..0000000 | |||
282 | --- a/debian/patches/ubuntu-clear-invalid-initrd-spacing.patch | |||
283 | +++ /dev/null | |||
284 | @@ -1,27 +0,0 @@ | |||
285 | 1 | From 0791ce3b6a862e3e714a1bf226b81a21862d9b5b Mon Sep 17 00:00:00 2001 | ||
286 | 2 | From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com> | ||
287 | 3 | Date: Thu, 11 Jul 2019 09:07:47 -0400 | ||
288 | 4 | Subject: UBUNTU: Clear up incorrect spacing when not using early initrds | ||
289 | 5 | |||
290 | 6 | Signed-off-by: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com> | ||
291 | 7 | Patch-Name: ubuntu-clear-invalid-initrd-spacing.patch | ||
292 | 8 | --- | ||
293 | 9 | util/grub.d/10_linux.in | 5 ++++- | ||
294 | 10 | 1 file changed, 4 insertions(+), 1 deletion(-) | ||
295 | 11 | |||
296 | 12 | diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in | ||
297 | 13 | index 13f39b9f6..a95992a77 100644 | ||
298 | 14 | --- a/util/grub.d/10_linux.in | ||
299 | 15 | +++ b/util/grub.d/10_linux.in | ||
300 | 16 | @@ -366,7 +366,10 @@ while [ "x$list" != "x" ] ; do | ||
301 | 17 | |||
302 | 18 | initrd= | ||
303 | 19 | if test -n "${initrd_early}" || test -n "${initrd_real}"; then | ||
304 | 20 | - initrd="${initrd_early} ${initrd_real}" | ||
305 | 21 | + initrd="${initrd_real}" | ||
306 | 22 | + if test -n "${initrd_early}"; then | ||
307 | 23 | + initrd="${initrd_early} ${initrd}" | ||
308 | 24 | + fi | ||
309 | 25 | |||
310 | 26 | initrd_display= | ||
311 | 27 | for i in ${initrd}; do | ||
312 | diff --git a/debian/patches/ubuntu-dont-verify-loopback-images.patch b/debian/patches/ubuntu-dont-verify-loopback-images.patch | |||
313 | index 2a5adee..1562a79 100644 | |||
314 | --- a/debian/patches/ubuntu-dont-verify-loopback-images.patch | |||
315 | +++ b/debian/patches/ubuntu-dont-verify-loopback-images.patch | |||
316 | @@ -1,4 +1,4 @@ | |||
318 | 1 | From 0fb88755986ad4c14500e769b8543a9a72e718ef Mon Sep 17 00:00:00 2001 | 1 | From f4ad1d67b9ce062fd85c0b5cd1c255260989c5a5 Mon Sep 17 00:00:00 2001 |
319 | 2 | From: Chris Coulson <chris.coulson@canonical.com> | 2 | From: Chris Coulson <chris.coulson@canonical.com> |
320 | 3 | Date: Mon, 1 Jun 2020 14:03:37 +0100 | 3 | Date: Mon, 1 Jun 2020 14:03:37 +0100 |
321 | 4 | Subject: UBUNTU: disk/loopback: Don't verify loopback images | 4 | Subject: UBUNTU: disk/loopback: Don't verify loopback images |
322 | diff --git a/debian/patches/ubuntu-efi-allow-loopmount-chainload.patch b/debian/patches/ubuntu-efi-allow-loopmount-chainload.patch | |||
323 | index ae46eb8..bd71729 100644 | |||
324 | --- a/debian/patches/ubuntu-efi-allow-loopmount-chainload.patch | |||
325 | +++ b/debian/patches/ubuntu-efi-allow-loopmount-chainload.patch | |||
326 | @@ -1,4 +1,4 @@ | |||
328 | 1 | From 21aee738cf34184cc8546eafb31fac79b90f7409 Mon Sep 17 00:00:00 2001 | 1 | From 1cc5aadf105ba7037e2625ac22a89d7feea09109 Mon Sep 17 00:00:00 2001 |
329 | 2 | From: Dimitri John Ledkov <xnox@ubuntu.com> | 2 | From: Dimitri John Ledkov <xnox@ubuntu.com> |
330 | 3 | Date: Wed, 27 Nov 2019 23:12:35 +0000 | 3 | Date: Wed, 27 Nov 2019 23:12:35 +0000 |
331 | 4 | Subject: UBUNTU: Allow chainloading EFI apps from loop mounts. | 4 | Subject: UBUNTU: Allow chainloading EFI apps from loop mounts. |
332 | diff --git a/debian/patches/ubuntu-fix-lzma-decompressor-objcopy.patch b/debian/patches/ubuntu-fix-lzma-decompressor-objcopy.patch | |||
333 | index 838d069..d256d44 100644 | |||
334 | --- a/debian/patches/ubuntu-fix-lzma-decompressor-objcopy.patch | |||
335 | +++ b/debian/patches/ubuntu-fix-lzma-decompressor-objcopy.patch | |||
336 | @@ -1,4 +1,4 @@ | |||
338 | 1 | From 07c82b2e9d096aed1e826f4ae821ecad7029f0b3 Mon Sep 17 00:00:00 2001 | 1 | From 4dfa975de0c2289b33ab76f06e70b01583f2c56d Mon Sep 17 00:00:00 2001 |
339 | 2 | From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com> | 2 | From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com> |
340 | 3 | Date: Wed, 3 Jul 2019 15:21:16 -0400 | 3 | Date: Wed, 3 Jul 2019 15:21:16 -0400 |
341 | 4 | Subject: UBUNTU: Have the lzma decompressor image only contain the .text | 4 | Subject: UBUNTU: Have the lzma decompressor image only contain the .text |
342 | diff --git a/debian/patches/ubuntu-flavour-order.patch b/debian/patches/ubuntu-flavour-order.patch | |||
343 | index 5c894a4..47e8449 100644 | |||
344 | --- a/debian/patches/ubuntu-flavour-order.patch | |||
345 | +++ b/debian/patches/ubuntu-flavour-order.patch | |||
346 | @@ -1,4 +1,4 @@ | |||
348 | 1 | From 10e2a52f5516dafa5332d29aa1015d24b0db972d Mon Sep 17 00:00:00 2001 | 1 | From d8b1fe38422efc282fd97790198b4a9a340a6bdf Mon Sep 17 00:00:00 2001 |
349 | 2 | From: Julian Andres Klode <julian.klode@canonical.com> | 2 | From: Julian Andres Klode <julian.klode@canonical.com> |
350 | 3 | Date: Tue, 9 Jun 2020 11:50:23 +0200 | 3 | Date: Tue, 9 Jun 2020 11:50:23 +0200 |
351 | 4 | Subject: UBUNTU: Add GRUB_FLAVOUR_ORDER configuration item | 4 | Subject: UBUNTU: Add GRUB_FLAVOUR_ORDER configuration item |
352 | diff --git a/debian/patches/ubuntu-mkconfig-leave-breadcrumbs.patch b/debian/patches/ubuntu-mkconfig-leave-breadcrumbs.patch | |||
353 | index 488766d..5f7e67d 100644 | |||
354 | --- a/debian/patches/ubuntu-mkconfig-leave-breadcrumbs.patch | |||
355 | +++ b/debian/patches/ubuntu-mkconfig-leave-breadcrumbs.patch | |||
356 | @@ -1,4 +1,4 @@ | |||
358 | 1 | From 4026f38f37e0ece7c8c6d0996c7fd181241010da Mon Sep 17 00:00:00 2001 | 1 | From f78a4044403841f4685924aa59cda87b8ffd4126 Mon Sep 17 00:00:00 2001 |
359 | 2 | From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com> | 2 | From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com> |
360 | 3 | Date: Fri, 14 Dec 2018 13:46:14 -0500 | 3 | Date: Fri, 14 Dec 2018 13:46:14 -0500 |
361 | 4 | Subject: UBUNTU: grub-mkconfig: leave a trace of what files were sourced to | 4 | Subject: UBUNTU: grub-mkconfig: leave a trace of what files were sourced to |
362 | diff --git a/debian/patches/ubuntu-resilient-boot-boot-order.patch b/debian/patches/ubuntu-resilient-boot-boot-order.patch | |||
363 | index c63016c..820bb39 100644 | |||
364 | --- a/debian/patches/ubuntu-resilient-boot-boot-order.patch | |||
365 | +++ b/debian/patches/ubuntu-resilient-boot-boot-order.patch | |||
366 | @@ -1,4 +1,4 @@ | |||
368 | 1 | From 2d5c142c62c97d5934eababfb924882d4fe100ba Mon Sep 17 00:00:00 2001 | 1 | From 7a471059af0b7a511d51d43a26662c6424d88f56 Mon Sep 17 00:00:00 2001 |
369 | 2 | From: Julian Andres Klode <julian.klode@canonical.com> | 2 | From: Julian Andres Klode <julian.klode@canonical.com> |
370 | 3 | Date: Wed, 8 Apr 2020 11:05:25 +0200 | 3 | Date: Wed, 8 Apr 2020 11:05:25 +0200 |
371 | 4 | Subject: UBUNTU: efivar: Correctly handle boot order of multiple ESPs | 4 | Subject: UBUNTU: efivar: Correctly handle boot order of multiple ESPs |
372 | diff --git a/debian/patches/ubuntu-resilient-boot-ignore-alternative-esps.patch b/debian/patches/ubuntu-resilient-boot-ignore-alternative-esps.patch | |||
373 | index 773f806..cc7d80d 100644 | |||
374 | --- a/debian/patches/ubuntu-resilient-boot-ignore-alternative-esps.patch | |||
375 | +++ b/debian/patches/ubuntu-resilient-boot-ignore-alternative-esps.patch | |||
376 | @@ -1,4 +1,4 @@ | |||
378 | 1 | From f7e8057f7028b7f81e4d14d99bcd36583d9a419f Mon Sep 17 00:00:00 2001 | 1 | From 28f4a3b5e80e905042f5e68daa0150015fbdc470 Mon Sep 17 00:00:00 2001 |
379 | 2 | From: Julian Andres Klode <julian.klode@canonical.com> | 2 | From: Julian Andres Klode <julian.klode@canonical.com> |
380 | 3 | Date: Fri, 3 Apr 2020 13:43:49 +0200 | 3 | Date: Fri, 3 Apr 2020 13:43:49 +0200 |
381 | 4 | Subject: UBUNTU: efivar: Ignore alternative ESPs | 4 | Subject: UBUNTU: efivar: Ignore alternative ESPs |
382 | 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 | |||
383 | index 44c6f96..5a47dd0 100644 | |||
384 | --- a/debian/patches/ubuntu-skip-disk-by-id-lvm-pvm-uuid-entries.patch | |||
385 | +++ b/debian/patches/ubuntu-skip-disk-by-id-lvm-pvm-uuid-entries.patch | |||
386 | @@ -1,4 +1,4 @@ | |||
388 | 1 | From a6637aee3e6de2b2582a154f040b299ee66ba4fe Mon Sep 17 00:00:00 2001 | 1 | From 1c8dcce2384bc93646592c9a7a8f39aa6ce6e35b Mon Sep 17 00:00:00 2001 |
389 | 2 | From: Rafael David Tinoco <rafaeldtinoco@ubuntu.com> | 2 | From: Rafael David Tinoco <rafaeldtinoco@ubuntu.com> |
390 | 3 | Date: Mon, 7 Oct 2019 22:53:32 -0300 | 3 | Date: Mon, 7 Oct 2019 22:53:32 -0300 |
391 | 4 | Subject: Skip /dev/disk/by-id/lvm-pvm-uuid entries from device iteration | 4 | Subject: Skip /dev/disk/by-id/lvm-pvm-uuid entries from device iteration |
392 | diff --git a/debian/patches/ubuntu-speed-zsys-history.patch b/debian/patches/ubuntu-speed-zsys-history.patch | |||
393 | index 052e09c..f3abe4a 100644 | |||
394 | --- a/debian/patches/ubuntu-speed-zsys-history.patch | |||
395 | +++ b/debian/patches/ubuntu-speed-zsys-history.patch | |||
396 | @@ -1,4 +1,4 @@ | |||
398 | 1 | From 8ccf766784ffb18bc9d4d6f25e07c733dc96e281 Mon Sep 17 00:00:00 2001 | 1 | From 2180fd20a0bc9ddc2e43e2181959fb3f767dcabc Mon Sep 17 00:00:00 2001 |
399 | 2 | From: Didier Roche <didrocks@ubuntu.com> | 2 | From: Didier Roche <didrocks@ubuntu.com> |
400 | 3 | Date: Mon, 13 Apr 2020 15:12:21 +0200 | 3 | Date: Mon, 13 Apr 2020 15:12:21 +0200 |
401 | 4 | Subject: UBUNTU: Improve performance in bootmenu for zsys | 4 | Subject: UBUNTU: Improve performance in bootmenu for zsys |
402 | diff --git a/debian/patches/ubuntu-temp-keep-auto-nvram.patch b/debian/patches/ubuntu-temp-keep-auto-nvram.patch | |||
403 | index 15a2895..96433a2 100644 | |||
404 | --- a/debian/patches/ubuntu-temp-keep-auto-nvram.patch | |||
405 | +++ b/debian/patches/ubuntu-temp-keep-auto-nvram.patch | |||
406 | @@ -1,4 +1,4 @@ | |||
408 | 1 | From 1055f320d63fac13d951b6b26630b356b65c199c Mon Sep 17 00:00:00 2001 | 1 | From 698e98751624982b8367c1cfde1beeec0d4c5cea Mon Sep 17 00:00:00 2001 |
409 | 2 | From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com> | 2 | From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com> |
410 | 3 | Date: Tue, 16 Jul 2019 09:52:10 -0400 | 3 | Date: Tue, 16 Jul 2019 09:52:10 -0400 |
411 | 4 | Subject: UBUNTU: Temporarily keep grub-install's --auto-nvram. | 4 | Subject: UBUNTU: Temporarily keep grub-install's --auto-nvram. |
412 | diff --git a/debian/patches/ubuntu-tpm-unknown-error-non-fatal.patch b/debian/patches/ubuntu-tpm-unknown-error-non-fatal.patch | |||
413 | index 62fb91a..81d3f8d 100644 | |||
414 | --- a/debian/patches/ubuntu-tpm-unknown-error-non-fatal.patch | |||
415 | +++ b/debian/patches/ubuntu-tpm-unknown-error-non-fatal.patch | |||
416 | @@ -1,4 +1,4 @@ | |||
418 | 1 | From 232b4916c31086f2fac3ba02379c82633c52f25f Mon Sep 17 00:00:00 2001 | 1 | From 5b7a5ab1640387e1d0275adc5acf16918218c6d9 Mon Sep 17 00:00:00 2001 |
419 | 2 | From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com> | 2 | From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com> |
420 | 3 | Date: Fri, 25 Oct 2019 10:25:04 -0400 | 3 | Date: Fri, 25 Oct 2019 10:25:04 -0400 |
421 | 4 | Subject: tpm: Pass unknown error as non-fatal, but debug print the error we | 4 | Subject: tpm: Pass unknown error as non-fatal, but debug print the error we |
422 | diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in | |||
423 | index 3eb0e69..14a89ba 100644 | |||
424 | --- a/util/grub.d/10_linux.in | |||
425 | +++ b/util/grub.d/10_linux.in | |||
426 | @@ -245,6 +245,14 @@ EOF | |||
427 | 245 | linux_root_device_thisversion="PARTUUID=${GRUB_FORCE_PARTUUID}" | 245 | linux_root_device_thisversion="PARTUUID=${GRUB_FORCE_PARTUUID}" |
428 | 246 | fi | 246 | fi |
429 | 247 | message="$(gettext_printf "Loading initial ramdisk ...")" | 247 | message="$(gettext_printf "Loading initial ramdisk ...")" |
430 | 248 | initrd_path= | ||
431 | 249 | for i in ${initrd}; do | ||
432 | 250 | initrd_path="${initrd_path} ${rel_dirname}/${i}" | ||
433 | 251 | done | ||
434 | 252 | initrd_path_only_early= | ||
435 | 253 | for i in ${initrd_early}; do | ||
436 | 254 | initrd_path_only_early="${initrd_path_only_early} ${rel_dirname}/${i}" | ||
437 | 255 | done | ||
438 | 248 | if test -n "${initrd}" && [ x"$GRUB_FORCE_PARTUUID" != x ]; then | 256 | if test -n "${initrd}" && [ x"$GRUB_FORCE_PARTUUID" != x ]; then |
439 | 249 | sed "s/^/$submenu_indentation/" << EOF | 257 | sed "s/^/$submenu_indentation/" << EOF |
440 | 250 | if [ "\${initrdfail}" = 1 ]; then | 258 | if [ "\${initrdfail}" = 1 ]; then |
441 | @@ -255,11 +263,17 @@ EOF | |||
442 | 255 | echo '$(echo "$message" | grub_quote)' | 263 | echo '$(echo "$message" | grub_quote)' |
443 | 256 | EOF | 264 | EOF |
444 | 257 | fi | 265 | fi |
445 | 258 | |||
446 | 259 | sed "s/^/$submenu_indentation/" << EOF | 266 | sed "s/^/$submenu_indentation/" << EOF |
448 | 260 | initrd ${rel_dirname}/${initrd} | 267 | initrd $(echo $initrd_path) |
449 | 261 | else | 268 | else |
450 | 262 | linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} panic=-1 | 269 | linux ${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} panic=-1 |
451 | 270 | EOF | ||
452 | 271 | if [ -n "$initrd_path_only_early" ]; then | ||
453 | 272 | sed "s/^/$submenu_indentation/" << EOF | ||
454 | 273 | initrd $(echo $initrd_path_only_early) | ||
455 | 274 | EOF | ||
456 | 275 | fi | ||
457 | 276 | sed "s/^/$submenu_indentation/" << EOF | ||
458 | 263 | fi | 277 | fi |
459 | 264 | initrdfail | 278 | initrdfail |
460 | 265 | EOF | 279 | EOF |
461 | @@ -277,7 +291,7 @@ EOF | |||
462 | 277 | EOF | 291 | EOF |
463 | 278 | fi | 292 | fi |
464 | 279 | sed "s/^/$submenu_indentation/" << EOF | 293 | sed "s/^/$submenu_indentation/" << EOF |
466 | 280 | initrd ${rel_dirname}/${initrd} | 294 | initrd $(echo $initrd_path) |
467 | 281 | EOF | 295 | EOF |
468 | 282 | fi | 296 | fi |
469 | 283 | fi | 297 | fi |
470 | @@ -418,10 +432,7 @@ while [ "x$list" != "x" ] ; do | |||
471 | 418 | 432 | ||
472 | 419 | initrd= | 433 | initrd= |
473 | 420 | if test -n "${initrd_early}" || test -n "${initrd_real}"; then | 434 | if test -n "${initrd_early}" || test -n "${initrd_real}"; then |
478 | 421 | initrd="${initrd_real}" | 435 | initrd="${initrd_early} ${initrd_real}" |
475 | 422 | if test -n "${initrd_early}"; then | ||
476 | 423 | initrd="${initrd_early} ${initrd}" | ||
477 | 424 | fi | ||
479 | 425 | 436 | ||
480 | 426 | initrd_display= | 437 | initrd_display= |
481 | 427 | for i in ${initrd}; do | 438 | for i in ${initrd}; do |