From b975bb2c7fa777084621580f15759e99bdd66f39 Mon Sep 17 00:00:00 2001
From: mhoellein <mario@hoellein.online>
Date: Fri, 20 Aug 2021 12:01:52 +0200
Subject: [PATCH] committing changes in /etc made by "apt-get upgrade"

Package changes:
-grub-common 2.04-1ubuntu26.12 amd64
+grub-common 2.04-1ubuntu26.13 amd64
-grub-pc 2.04-1ubuntu26.12 amd64
-grub-pc-bin 2.04-1ubuntu26.12 amd64
-grub2-common 2.04-1ubuntu26.12 amd64
+grub-pc 2.04-1ubuntu26.13 amd64
+grub-pc-bin 2.04-1ubuntu26.13 amd64
+grub2-common 2.04-1ubuntu26.13 amd64
-icinga2 2.13.0-1.focal amd64
-icinga2-bin 2.13.0-1.focal amd64
-icinga2-common 2.13.0-1.focal all
-icinga2-doc 2.13.0-1.focal all
-icinga2-ido-mysql 2.13.0-1.focal amd64
+icinga2 2.13.1-1.focal amd64
+icinga2-bin 2.13.1-1.focal amd64
+icinga2-common 2.13.1-1.focal all
+icinga2-doc 2.13.1-1.focal all
+icinga2-ido-mysql 2.13.1-1.focal amd64
-vim-icinga2 2.13.0-1.focal all
+vim-icinga2 2.13.1-1.focal all
---
 .etckeeper                                             |  1 +
 grub.d/10_linux                                        | 10 ++++++++++
 .../system/multi-user.target.wants/grub-common.service |  1 +
 systemd/system/sleep.target.wants/grub-common.service  |  1 +
 .../sleep.target.wants/grub-initrd-fallback.service    |  1 +
 5 files changed, 14 insertions(+)
 create mode 120000 systemd/system/multi-user.target.wants/grub-common.service
 create mode 120000 systemd/system/sleep.target.wants/grub-common.service
 create mode 120000 systemd/system/sleep.target.wants/grub-initrd-fallback.service

diff --git a/.etckeeper b/.etckeeper
index 9e0493aed..3f00fc709 100755
--- a/.etckeeper
+++ b/.etckeeper
@@ -8500,6 +8500,7 @@ maybe chmod 0755 'systemd/system/multi-user.target.wants'
 maybe chmod 0755 'systemd/system/paths.target.wants'
 maybe chmod 0755 'systemd/system/rescue.target.wants'
 maybe chmod 0664 'systemd/system/set-route-network.service'
+maybe chmod 0755 'systemd/system/sleep.target.wants'
 maybe chmod 0755 'systemd/system/sockets.target.wants'
 maybe chmod 0755 'systemd/system/sysinit.target.wants'
 maybe chmod 0755 'systemd/system/timers.target.wants'
diff --git a/grub.d/10_linux b/grub.d/10_linux
index 5a43f0c78..a91bb2de3 100755
--- a/grub.d/10_linux
+++ b/grub.d/10_linux
@@ -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/systemd/system/multi-user.target.wants/grub-common.service b/systemd/system/multi-user.target.wants/grub-common.service
new file mode 120000
index 000000000..c0ca745ec
--- /dev/null
+++ b/systemd/system/multi-user.target.wants/grub-common.service
@@ -0,0 +1 @@
+/lib/systemd/system/grub-common.service
\ No newline at end of file
diff --git a/systemd/system/sleep.target.wants/grub-common.service b/systemd/system/sleep.target.wants/grub-common.service
new file mode 120000
index 000000000..c0ca745ec
--- /dev/null
+++ b/systemd/system/sleep.target.wants/grub-common.service
@@ -0,0 +1 @@
+/lib/systemd/system/grub-common.service
\ No newline at end of file
diff --git a/systemd/system/sleep.target.wants/grub-initrd-fallback.service b/systemd/system/sleep.target.wants/grub-initrd-fallback.service
new file mode 120000
index 000000000..6074eaa8f
--- /dev/null
+++ b/systemd/system/sleep.target.wants/grub-initrd-fallback.service
@@ -0,0 +1 @@
+/lib/systemd/system/grub-initrd-fallback.service
\ No newline at end of file
-- 
2.43.0