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

[Julian Andres Klode]

[Julian Andres Klode (juliank)]

I unapplied all patches in the focal branch already, otherwise the diff would not be readable, so real package diff is a bit larger.

diff --git a/debian/changelog b/debian/changelog
index f406713..beb59a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,25 @@
+grub2 (2.04-1ubuntu26.13) focal; urgency=medium
+
+  [ Julian Andres Klode ]
+  * unapply all patches, stop using git-dpm
+
+  [ Dimitri John Ledkov ]
+  * 10_linux: emit messages when initrdless boot is configured, attempted and
+    fails triggering fallback. LP: #1901553
+  * grub-common.service: port init.d script to systemd unit. Add warning
+    message, when initrdless boot fails triggering fallback. LP: #1901553
+  * debian/grub-common.service: change type to oneshot, add wantedby
+    sleep.target, after sleep.target. The service will now start after resume
+    from hybernation.  (LP: #1929860)
+  * grub-initrd-fallback.service: add wantedby sleep.target, after
+    sleep.target. The service will now start after resume from hybernation.
+    LP: #1929860
+  * grub-initrd-fallback.service, debian/grub-common.service: only start units
+    when booted with grub. Use presence of /boot/grub/grub.cfg as proxy. LP:
+    #1925507
+
+ -- Julian Andres Klode <[e-mail]>  Thu, 12 Aug 2021 11:18:25 +0200
+
 grub2 (2.04-1ubuntu26.12) focal; urgency=medium
 
   * Bump the version number in the replaces for grub-efi-* to account for
diff --git a/debian/grub-common.service b/debian/grub-common.service
new file mode 100644
index 0000000..fcf5474
--- /dev/null
+++ b/debian/grub-common.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=Record successful boot for GRUB
+After=sleep.target
+ConditionPathExists=/boot/grub/grub.cfg
+
+[Service]
+Type=oneshot
+Restart=no
+ExecStartPre=/bin/sh -c '[ -s /boot/grub/grubenv ] || rm -f /boot/grub/grubenv; mkdir -p /boot/grub'
+ExecStart=grub-editenv /boot/grub/grubenv unset recordfail
+ExecStartPost=/bin/sh -c 'if grub-editenv /boot/grub/grubenv list | grep -q initrdless_boot_fallback_triggered=1; then echo "grub: GRUB_FORCE_PARTUUID set, initrdless boot paniced, fallback triggered."; fi'
+StandardOutput=kmsg
+
+[Install]
+WantedBy=multi-user.target sleep.target
diff --git a/debian/patches/series b/debian/patches/series
index 89dfb3e..1749ca3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -114,3 +114,4 @@ rhboot-f34-make-exit-take-a-return-code.patch
 rhboot-f34-dont-use-int-for-efi-status.patch
 rhboot-f34-make-pmtimer-tsc-calibration-fast.patch
 cherry-fix-crash-on-http.patch
+ubuntu-add-initrd-less-boot-messages.patch
diff --git a/debian/patches/ubuntu-add-initrd-less-boot-fallback.patch b/debian/patches/ubuntu-add-initrd-less-boot-fallback.patch
index 82abad4..270a20f 100644
--- a/debian/patches/ubuntu-add-initrd-less-boot-fallback.patch
+++ b/debian/patches/ubuntu-add-initrd-less-boot-fallback.patch
@@ -11,10 +11,10 @@ Patch-Name: ubuntu-add-initrd-less-boot-fallback.patch
 ---
  Makefile.am                  |  3 ++
  configure.ac                 | 10 +++++++
- grub-initrd-fallback.service | 13 +++++++++
+ grub-initrd-fallback.service | 14 +++++++++
  util/grub.d/00_header.in     | 27 ++++++++++++++++++
  util/grub.d/10_linux.in      | 68 +++++++++++++++++++++++++++++++++-----------
- 5 files changed, 105 insertions(+), 16 deletions(-)
+ 5 files changed, 106 insertions(+), 16 deletions(-)
  create mode 100644 grub-initrd-fallback.service
 
 diff --git a/Makefile.am b/Makefile.am
@@ -54,14 +54,15 @@ index 8832455..1819188 100644
  #
 diff --git a/grub-initrd-fallback.service b/grub-initrd-fallback.service
 new file mode 100644
-index 0000000..fb0b76e
+index 0000000..1a0a4e5
 --- /dev/null
 +++ b/grub-initrd-fallback.service
-@@ -0,0 +1,13 @@
+@@ -0,0 +1,14 @@
 +[Unit]
 +Description=GRUB failed boot detection
 +After=local-fs.target
 +After=grub-common.service
++After=sleep.target
 +
 +[Service]
 +Type=oneshot
@@ -70,7 +71,7 @@ index 0000000..fb0b76e
 +TimeoutSec=0
 +
 +[Install]
-+WantedBy=multi-user.target rescue.target emergency.target
++WantedBy=multi-user.target rescue.target emergency.target sleep.target
 diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
 index b7135b6..2642f66 100644
 --- a/util/grub.d/00_header.in
diff --git a/debian/patches/ubuntu-add-initrd-less-boot-messages.patch b/debian/patches/ubuntu-add-initrd-less-boot-messages.patch
new file mode 100644
index 0000000..4872bf3
--- /dev/null
+++ b/debian/patches/ubuntu-add-initrd-less-boot-messages.patch
@@ -0,0 +1,66 @@
+From: Dimitri John Ledkov <[e-mail]>
+Date: Mon, 26 Oct 2020 11:38:34 +0000
+Subject: Ubuntu: add initrd-less-boot informational messages
+
+Add additional messages when initrd-less boot is attempted or
+fails. As otherwise it is not obvious why boot seems to panic and
+reboot by default.
+---
+ grub-initrd-fallback.service |  1 +
+ util/grub.d/10_linux.in      | 10 ++++++++++
+ 2 files changed, 11 insertions(+)
+
+diff --git a/grub-initrd-fallback.service b/grub-initrd-fallback.service
+index 1a0a4e5..59d1a62 100644
+--- a/grub-initrd-fallback.service
++++ b/grub-initrd-fallback.service
+@@ -3,6 +3,7 @@ Description=GRUB failed boot detection
+ After=local-fs.target
+ After=grub-common.service
+ After=sleep.target
++ConditionPathExists=/boot/grub/grub.cfg
+ 
+ [Service]
+ Type=oneshot
+diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
+index 49e6272..47daf51 100644
+--- a/util/grub.d/10_linux.in
++++ b/util/grub.d/10_linux.in
+@@ -160,6 +160,12 @@ if [ "$vt_handoff" = 1 ]; then
+ fi
+ 
+ if [ x"$GRUB_FORCE_PARTUUID" != x ]; then
++    gettext_printf "GRUB_FORCE_PARTUUID is set, will attempt initrdless boot\n" >&2
++    cat << EOF
++#
++# GRUB_FORCE_PARTUUID is set, will attempt initrdless boot
++# Upon panic fallback to booting with initrd
++EOF
+    echo "set partuuid=${GRUB_FORCE_PARTUUID}"
+ fi
+ 
+@@ -245,6 +251,8 @@ EOF
+         linux_root_device_thisversion="PARTUUID=${GRUB_FORCE_PARTUUID}"
+     fi
+     message="$(gettext_printf "Loading initial ramdisk ...")"
++    initrdlessfail_msg="$(gettext_printf "GRUB_FORCE_PARTUUID set, initrdless boot failed. Attempting with initrd.")"
++    initrdlesstry_msg="$(gettext_printf "GRUB_FORCE_PARTUUID set, attempting initrdless boot.")"
+     initrd_path=
+     for i in ${initrd}; do
+         initrd_path="${initrd_path} ${rel_dirname}/${i}"
+@@ -256,6 +264,7 @@ EOF
+     if test -n "${initrd}" && [ x"$GRUB_FORCE_PARTUUID" != x ]; then
+         sed "s/^/$submenu_indentation/" << EOF
+ 	if [ "\${initrdfail}" = 1 ]; then
++	  echo	'$(echo "$initrdlessfail_msg" | grub_quote)'
+ 	  linux	${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
+ EOF
+         if [ x"$quiet_boot" = x0 ] || [ x"$type" != xsimple ]; then
+@@ -266,6 +275,7 @@ EOF
+         sed "s/^/$submenu_indentation/" << EOF
+ 	  initrd	$(echo $initrd_path)
+ 	else
++	  echo	'$(echo "$initrdlesstry_msg" | grub_quote)'
+ 	  linux	${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args} panic=-1
+ EOF
+         if [ -n "$initrd_path_only_early" ]; then