From f45f540b656ddd1c343d8292a09d74eb196ce22f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20L=C3=BCke?= Date: Thu, 30 Jul 2020 19:16:47 +0200 Subject: [PATCH] sys-apps/systemd: Add tmpfile directive for /var/log/journal/remote The folder /var/log/journal/remote used to be part of the inital rootfs through a keepdir directive in the build. However, any paths except /usr are ephemeral and can be deleted at any time and should be recreated with tmpfile directives. When upstream Gentoo removed the line "keepdir /var/log/journal/remote" our tests started to fail but in fact they could have failed earlier if they had tested with Ignition creating a new root filesystem which lacks the /var/log/journal/remote folder. Add a directive to create /var/log/journal/remote at runtime in any case. --- .../coreos-overlay/sys-apps/systemd/files/systemd-flatcar.conf | 1 + .../systemd/{systemd-245.ebuild => systemd-245-r1.ebuild} | 0 2 files changed, 1 insertion(+) rename sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/{systemd-245.ebuild => systemd-245-r1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/systemd-flatcar.conf b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/systemd-flatcar.conf index fcb8f86bfe..013c8e1634 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/systemd-flatcar.conf +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/systemd-flatcar.conf @@ -7,3 +7,4 @@ d /etc/systemd/system - - - - - d /etc/systemd/user - - - - - d /etc/tmpfiles.d - - - - - d /etc/sysusers.d - - - - - +d /var/log/journal/remote - systemd-journal-remote systemd-journal-remote - - diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-245.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-245-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-245.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-245-r1.ebuild