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

[Julian Andres Klode]

[Dimitri John Ledkov (xnox)]

review: Approve

[Dimitri John Ledkov (xnox)]

I approved this, did it land?

Unmerged commits

f440bd4... by Julian Andres Klode on 2022-10-12

grub-common.service: Add After/Requires=boot-complete.target

LP: #1992643

a093515... by Julian Andres Klode on 2022-10-04

Try to pick better locations for kernel and initrd

LP: #1989446

5e9731a... by Julian Andres Klode on 2022-09-19

releasing package grub2 version 2.06-2ubuntu12

1c0c8a3... by Julian Andres Klode on 2022-09-19

ubuntu-zfs-enhance-support.patch: Fix missing lines

The line count of the file was too short for unknown reasons,
fix this manually and then reimport and export the patch series
to clean up all the hunk locations.

LP: #1990143

2fa139e... by dann frazier on 2022-09-14

releasing package grub2 version 2.06-2ubuntu11

64478a9... by Julian Andres Klode on 2022-08-29

Cleanup patch series

d5f693b... by dann frazier on 2022-08-27

linuxefi: Invalidate i-cache before starting the kernel (LP: #1987924)

- d/p/linuxefi-Invalidate-i-cache-before-starting-the-kern.patch

Gbp-Dch: Full

196b45a... by Mauricio Faria de Oliveira on 2022-08-27

Fix for ZFS snapshots without etc directory

In the situation where ZFS snapshots do not contain a .../etc directory,
the generation of /b/g/grub.cfg silently fails, providing no "linux"
kernel lines in the /b/g/grub.cfg file.

This patch prevents this type of failure from occurring.

This issue is especially apparent on systems running in FIPS mode
with ZFS boot+root pools.

Source: https://code.launchpad.net/~arbell/grub/+git/grub/+merge/417575

LP: #1965983
Thanks: Adam R Bell <email address hidden>

Signed-off-by: Mauricio Faria de Oliveira <email address hidden>

83bcaf1... by Heinrich Schuchardt on 2022-08-19

efi/peimage: fix typos in code comments

Signed-off-by: Heinrich Schuchardt <email address hidden>

47a3d1d... by Mauricio Faria de Oliveira on 2022-08-24

linux_xen: Properly handle multiple initrd files (LP: #1987567)

- d/p/linux_xen-Properly-load-multiple-initrd-files.patch
- d/p/linux_xen-Properly-order-multiple-initrd-files.patch

Gbp-Dch: Full

diff --git a/debian/grub-common.service b/debian/grub-common.service
index fcf5474..cb5c086 100644
--- a/debian/grub-common.service
+++ b/debian/grub-common.service
@@ -1,6 +1,7 @@
 [Unit]
 Description=Record successful boot for GRUB
-After=sleep.target
+Requires=boot-complete.target
+After=boot-complete.target sleep.target
 ConditionPathExists=/boot/grub/grub.cfg
 
 [Service]