From 77c778b8fddc8034744df9c4857d75c9e6db6dbf Mon Sep 17 00:00:00 2001 From: CloudBuilder Date: Mon, 14 Feb 2022 18:59:14 +0000 Subject: [PATCH] Imported 2.756 No reason for CPC update specified. --- debian/changelog | 8 ++++++++ live-build/functions | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 0320c59a..47813586 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.756) jammy; urgency=medium + + * Unset `initrdless_boot_fallback_triggered` in /boot/grub/grubenv instead + of setting it to 0 when the fallback is not triggered to prevent integrity + monitoring errors on GCE. (LP: #1960564) + + -- Ivan Kapelyukhin Thu, 10 Feb 2022 23:45:57 +0100 + livecd-rootfs (2.755) jammy; urgency=medium [ Brian Murray ] diff --git a/live-build/functions b/live-build/functions index 3d01b0e3..2825687c 100644 --- a/live-build/functions +++ b/live-build/functions @@ -1141,7 +1141,7 @@ if [ -n "${have_grubenv}" ]; then if [ -n "${initrdfail}" ]; then set initrdless_boot_fallback_triggered="${initrdfail}" else - set initrdless_boot_fallback_triggered=0 + unset initrdless_boot_fallback_triggered fi save_env initrdless_boot_fallback_triggered fi