From 179518bbab031d6c523ffaff66bae88a2e11ed0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Wed, 20 Oct 2021 20:30:43 +0200 Subject: [PATCH] fedora-iot-base: Update persistent journal workaround Add a systemd configuration drop-in instead of modyfing the default configuration file. Imported from: https://github.com/coreos/fedora-coreos-config/blob/testing-devel/overlay.d/05core/usr/lib/systemd/journald.conf.d/10-coreos-persistent.conf --- treecompose-post.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/treecompose-post.sh b/treecompose-post.sh index 81d6c5e..4b86bf3 100755 --- a/treecompose-post.sh +++ b/treecompose-post.sh @@ -2,12 +2,8 @@ set -xeuo pipefail -# Work around https://bugzilla.redhat.com/show_bug.cgi?id=1265295 -# Also note the create-new-then-rename dance for rofiles-fuse compat -if ! grep -q '^Storage=persistent' /etc/systemd/journald.conf; then - (cat /etc/systemd/journald.conf && echo 'Storage=persistent') > /etc/systemd.journald.conf.new - mv /etc/systemd.journald.conf{.new,} -fi +# From https://github.com/coreos/fedora-coreos-config/blob/testing-devel/overlay.d/05core/usr/lib/systemd/journald.conf.d/10-coreos-persistent.conf +echo -e "[Journal]\nStorage=persistent" > /usr/lib/systemd/journald.conf.d/10-persistent.conf # See: https://src.fedoraproject.org/rpms/glibc/pull-request/4 # Basically that program handles deleting old shared library directories