From 4ce8bd3e08b782aa9d2fd5a19d1985a18c5f02b9 Mon Sep 17 00:00:00 2001 From: CloudBuilder Date: Thu, 3 Feb 2022 01:59:22 +0000 Subject: [PATCH] Imported 2.753 No reason for CPC update specified. --- debian/changelog | 9 +++++++++ .../etc/systemd/journald.conf.d/no-zstd.conf | 4 ++++ .../system/systemd-journald.service.d/no-hardening.conf | 4 ++++ 3 files changed, 17 insertions(+) create mode 100644 live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/etc/systemd/journald.conf.d/no-zstd.conf create mode 100644 live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/etc/systemd/system/systemd-journald.service.d/no-hardening.conf diff --git a/debian/changelog b/debian/changelog index 921e5df5..901a57ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +livecd-rootfs (2.753) jammy; urgency=medium + + * Disable compression and "hash table hardening" for journald in the + live installer environment as these features make the journal unreadable + using the systemd libraries from 20.04 that are included in the subiquity + snap. (LP: #1953744) + + -- Michael Hudson-Doyle Wed, 02 Feb 2022 22:43:20 +1300 + livecd-rootfs (2.752) jammy; urgency=medium * Remove references to archive.canonical.com, which is no longer used and diff --git a/live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/etc/systemd/journald.conf.d/no-zstd.conf b/live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/etc/systemd/journald.conf.d/no-zstd.conf new file mode 100644 index 00000000..060bf85b --- /dev/null +++ b/live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/etc/systemd/journald.conf.d/no-zstd.conf @@ -0,0 +1,4 @@ +# systemd in 22.04+ uses zstd compression by default, which is not understood +# by the systemd libraries from focal used in the subiquity snap. +[Journal] +Compress=false diff --git a/live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/etc/systemd/system/systemd-journald.service.d/no-hardening.conf b/live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/etc/systemd/system/systemd-journald.service.d/no-hardening.conf new file mode 100644 index 00000000..c4262d26 --- /dev/null +++ b/live-build/ubuntu-server/includes.chroot.ubuntu-server-minimal.ubuntu-server.installer/etc/systemd/system/systemd-journald.service.d/no-hardening.conf @@ -0,0 +1,4 @@ +# systemd in 22.04+ uses "hash table hardening" by default which is not +# understood by the systemd libraries from focal used in the subiquity snap. +[Service] +Environment="SYSTEMD_JOURNAL_KEYED_HASH=0"