Merge ~xnox/grub:initrdless-docs into ~ubuntu-core-dev/grub/+git/ubuntu:ubuntu

[Dimitri John Ledkov]

Add more messages about initrdless boot.

See https://bugs.launchpad.net/ubuntu/+source/grub2/+bug/1901553

[Dimitri John Ledkov (xnox)]

The general concept is to show something:

1) upon update-grub
2) before initrdless boot is attempted (grub output might not be visible)
3) before initrdfull fallback is attempted (grub output might not be visible)
4) log kmsg/journal from running system when fallback got triggered (should be visible)

[David Krauser (davidkrauser)]

review: Needs Information

[Dimitri John Ledkov (xnox)]

@CPC as discussed before we wanted to leave more breadcrumbs for users to be able to understand when initrdless boot is attempted and/or fails.

Is this the right UX that you were requested in the summer of 2020 during our meeting in the midcycle?

Do you still want these changes?

[David Krauser (davidkrauser)]

@xnox, yes it is, and yes we do - thank you :-)

review: Approve

diff --git a/debian/.git-dpm b/debian/.git-dpm
index 63f5a6e..b8d04a8 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,6 +1,6 @@
 # see git-dpm(1) from git-dpm package
-26335cb229a6b969449f80dc6c5aed949ee1d86c
-26335cb229a6b969449f80dc6c5aed949ee1d86c
+50b137848fd25a580fcd76760802af16e4e961fa
+50b137848fd25a580fcd76760802af16e4e961fa
 578bb115fbd47e1c464696f1f8d6183e5443975d
 578bb115fbd47e1c464696f1f8d6183e5443975d
 grub2_2.04.orig.tar.xz
diff --git a/debian/changelog b/debian/changelog
index 2284047..a9de8cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+grub2 (2.04-1ubuntu36) UNRELEASED; urgency=medium
+
+  * 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
+
+ -- Dimitri John Ledkov <[e-mail]>  Tue, 27 Oct 2020 13:07:20 +0000
+
 grub2 (2.04-1ubuntu35) groovy; urgency=medium
 
   * postinst.in, grub-multi-install: fix logic of skipping installing onto
diff --git a/debian/grub-common.service b/debian/grub-common.service
new file mode 100644
index 0000000..1395ad9
--- /dev/null
+++ b/debian/grub-common.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=Record successful boot for GRUB
+
+[Service]
+Type=simple
+Restart=no
+RemainAfterExit=yes
+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 "<3>grub: GRUB_FORCE_PARTUUID set, initrdless boot paniced, fallback triggered."; fi'
+StandardOutput=kmsg
+
+[Install]
+WantedBy=multi-user.target
\ No newline at end of file
diff --git a/debian/patches/series b/debian/patches/series
index ebb7077..f6fbf31 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -109,3 +109,4 @@ ubuntu-recovery-dis_ucode_ldr.patch
 grub-install-backup-and-restore.patch
 ubuntu-linuxefi-arm64.patch
 ubuntu-dejavu-font-path.patch
+ubuntu-add-initrd-less-boot-messages.patch
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..188bb69
--- /dev/null
+++ b/debian/patches/ubuntu-add-initrd-less-boot-messages.patch
@@ -0,0 +1,56 @@
+From 50b137848fd25a580fcd76760802af16e4e961fa Mon Sep 17 00:00:00 2001
+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.
+
+Patch-Name: ubuntu-add-initrd-less-boot-messages.patch
+---
+ util/grub.d/10_linux.in | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
+index 49e627228f..47daf51eed 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
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