Merge ~juliank/grub/+git/bionic:initrdless-backport into ~ubuntu-core-dev/grub/+git/bionic:master

[Julian Andres Klode]

[Julian Andres Klode (juliank)]

I think this might miss some service enablement somewhere, the grub-common.service was not enabled upon install from PPA

https://launchpad.net/~ubuntu-uefi-team/+archive/ubuntu/ppa

diff --git a/debian/changelog b/debian/changelog
index 59dd791..ef2fee5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,33 @@
+grub2 (2.02-2ubuntu8.24) bionic; urgency=medium
+
+  [ Julian Andres Klode ]
+  * Backport initrd-less fallback support as pre-requisite for other patches
+    (in LP: #1901553)
+    - debian/patches/add-initrd-less-boot-fallback.patch: add initrd-less
+      capabilities. If a kernel fails to boot without initrd, grub will
+      fallback to trying to boot the kernel with an initrd. Patch by Chris Glass.
+  * systemd backports:
+    - Use absolute path to grub-editenv in debian/grub-common.service below to
+      make bionic systemd happy.
+    - Pass --with systemd to dh
+
+  [ 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]>  Wed, 29 Sep 2021 12:53:51 +0200
+
 grub2 (2.02-2ubuntu8.23) bionic; urgency=medium
 
   [ Dimitri John Ledkov & Steve Langasek ]
diff --git a/debian/grub-common.service b/debian/grub-common.service
new file mode 100644
index 0000000..0442534
--- /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=/usr/bin/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 14482ec..e11f826 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -120,3 +120,5 @@ grub-install-backup-and-restore.patch
 ubuntu-linuxefi-arm64-set-base-addr.patch
 tftp-rollover-block-counter.patch
 R_X86_64_PLT32.patch
+ubuntu-add-initrd-less-boot-fallback.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
new file mode 100644
index 0000000..6518a94
--- /dev/null
+++ b/debian/patches/ubuntu-add-initrd-less-boot-fallback.patch
@@ -0,0 +1,209 @@
+From: Chris Glass <[e-mail]>
+Date: Fri, 9 Mar 2018 13:47:07 +0100
+Subject: UBUNTU: Added initrd-less boot capabilities.
+
+In case the kernel fails to boot without an initrd, grub will fallback
+to trying to boot the kernel with an initrd.
+
+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 | 14 ++++++++++
+ util/grub.d/00_header.in     | 27 ++++++++++++++++++
+ util/grub.d/10_linux.in      | 66 +++++++++++++++++++++++++++++++++++---------
+ 5 files changed, 107 insertions(+), 13 deletions(-)
+ create mode 100644 grub-initrd-fallback.service
+
+diff --git a/Makefile.am b/Makefile.am
+index f0ab1ad..aaf2bbf 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -472,4 +472,7 @@ ChangeLog: FORCE
+ 		touch $@; \
+ 	fi
+ 
++systemdsystemunit_DATA = \
++	grub-initrd-fallback.service
++
+ EXTRA_DIST += ChangeLog ChangeLog-2015
+diff --git a/configure.ac b/configure.ac
+index 3fbd7b0..05920c2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -287,6 +287,16 @@ AC_SUBST(grubdirname)
+ AC_DEFINE_UNQUOTED(GRUB_DIR_NAME, "$grubdirname",
+     [Default grub directory name])
+ 
++##### systemd unit files
++AC_ARG_WITH([systemdsystemunitdir],
++            AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
++            [],
++            [with_systemdsystemunitdir=/usr/lib/systemd/system],
++            [with_systemdsystemunitdir=no])
++if test "x$with_systemdsystemunitdir" != xno; then
++   AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
++fi
++
+ #
+ # Checks for build programs.
+ #
+diff --git a/grub-initrd-fallback.service b/grub-initrd-fallback.service
+new file mode 100644
+index 0000000..1a0a4e5
+--- /dev/null
++++ b/grub-initrd-fallback.service
+@@ -0,0 +1,14 @@
++[Unit]
++Description=GRUB failed boot detection
++After=local-fs.target
++After=grub-common.service
++After=sleep.target
++
++[Service]
++Type=oneshot
++ExecStart=/usr/bin/grub-editenv /boot/grub/grubenv unset initrdfail
++ExecStart=/usr/bin/grub-editenv /boot/grub/grubenv unset prev_entry
++TimeoutSec=0
++
++[Install]
++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
++++ b/util/grub.d/00_header.in
+@@ -50,6 +50,18 @@ if [ -s \$prefix/grubenv ]; then
+   load_env
+ fi
+ EOF
++cat <<EOF
++if [ "\${initrdfail}" = 2 ]; then
++   set initrdfail=
++elif [ "\${initrdfail}" = 1 ]; then
++   set next_entry="\${prev_entry}"
++   set prev_entry=
++   save_env prev_entry
++   if [ "\${next_entry}" ]; then
++      set initrdfail=2
++   fi
++fi
++EOF
+ if [ "x$GRUB_BUTTON_CMOS_ADDRESS" != "x" ]; then
+     cat <<EOF
+ if cmostest $GRUB_BUTTON_CMOS_ADDRESS ; then
+@@ -101,6 +113,21 @@ function savedefault {
+ }
+ EOF
+ 
++cat <<"EOF"
++function initrdfail {
++    if [ -n "${have_grubenv}" ]; then if [ -n "${partuuid}" ]; then
++      if [ -z "${initrdfail}" ]; then
++        set initrdfail=1
++        if [ -n "${boot_once}" ]; then
++          set prev_entry="${default}"
++          save_env prev_entry
++        fi
++      fi
++      save_env initrdfail
++    fi; fi
++}
++EOF
++
+ if [ "$quick_boot" = 1 ]; then
+     cat <<EOF
+ function recordfail {
+diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
+index 82fd19f..6fe1377 100644
+--- a/util/grub.d/10_linux.in
++++ b/util/grub.d/10_linux.in
+@@ -104,6 +104,10 @@ if [ "$vt_handoff" = 1 ]; then
+   done
+ fi
+ 
++if [ x"$GRUB_FORCE_PARTUUID" != x ]; then
++   echo "set partuuid=${GRUB_FORCE_PARTUUID}"
++fi
++
+ linux_entry ()
+ {
+   os="$1"
+@@ -179,27 +183,63 @@ EOF
+ 	linux	${rel_dirname}/${basename}.efi.signed root=${linux_root_device_thisversion} ro ${args}
+ EOF
+   else
+-    if [ x"$GRUB_FORCE_PARTUUID" = x ]; then
++    # We have initrd and PARTUUID is set - we try to boot without initrd, and fallback to using it
++    # if it fails.
++    # "panic=-1" means "on panic reboot immediately". "panic=0" disables the reboot behavior.
++    if [ x"$GRUB_FORCE_PARTUUID" != x ]; then
++        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
++	  linux	${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
++EOF
++        if [ x"$quiet_boot" = x0 ] || [ x"$type" != xsimple ]; then
++          sed "s/^/$submenu_indentation/" << EOF
++	  echo	'$(echo "$message" | grub_quote)'
++EOF
++        fi
++        sed "s/^/$submenu_indentation/" << EOF
++	  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
+-        linux	${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
++	fi
++	initrdfail
+ EOF
+     else
++    # We don't have initrd or we don't want to set PARTUUID. Don't try initrd-less boot with fallback.
+         sed "s/^/$submenu_indentation/" << EOF
+-        linux	${rel_dirname}/${basename} root=PARTUUID=${GRUB_FORCE_PARTUUID} ro ${args}
++	linux	${rel_dirname}/${basename} root=${linux_root_device_thisversion} ro ${args}
+ EOF
+-    fi
+-  fi
+-  if test -n "${initrd}" && [ x"$GRUB_DISABLE_INITRD" != xtrue ]; then
+-    # TRANSLATORS: ramdisk isn't identifier. Should be translated.
+-    if [ x"$quiet_boot" = x0 ] || [ x"$type" != xsimple ]; then
+-      message="$(gettext_printf "Loading initial ramdisk ...")"
+-      sed "s/^/$submenu_indentation/" << EOF
++        if test -n "${initrd}"; then
++            # We do have initrd - let's use it at boot.
++            # TRANSLATORS: ramdisk isn't identifier. Should be translated.
++            if [ x"$quiet_boot" = x0 ] || [ x"$type" != xsimple ]; then
++              sed "s/^/$submenu_indentation/" << EOF
+ 	echo	'$(echo "$message" | grub_quote)'
+ EOF
+-    fi
+-    sed "s/^/$submenu_indentation/" << EOF
+-	initrd	${rel_dirname}/${initrd}
++            fi
++            sed "s/^/$submenu_indentation/" << EOF
++	initrd	$(echo $initrd_path)
+ EOF
++        fi
++    fi
+   fi
+   sed "s/^/$submenu_indentation/" << EOF
+ }
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..2dbd7e6
--- /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 6fe1377..3eeda4e 100644
+--- a/util/grub.d/10_linux.in
++++ b/util/grub.d/10_linux.in
+@@ -105,6 +105,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
+ 
+@@ -190,6 +196,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}"
+@@ -201,6 +209,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
+@@ -211,6 +220,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/debian/rules b/debian/rules
index 41b72e4..ef83834 100755
--- a/debian/rules
+++ b/debian/rules
@@ -115,7 +115,7 @@ endif
 endif
 
 %:
-	dh $@ --parallel
+	dh $@ --with systemd --parallel
 
 override_dh_auto_configure: $(patsubst %,configure/%,$(BUILD_PACKAGES))