From bd0386ff562faac2dbedf19e6af3564142b6f22b Mon Sep 17 00:00:00 2001 From: Matt Heon Date: Thu, 4 Sep 2025 09:51:37 -0400 Subject: [PATCH] Add R! to systemd-tmpfiles script for all /tmp dirs We already used `x` in tmpfiles, to ensure systemd did not remove our directories or clean their contents (we really need them to be left unmodified). However, systemd-tmpfiles lets us use more than one directive per line, which means we can safely add an R! (recursive remove on reboot) to these lines to ensure that, if /tmp is not a tmpfs, systemd-tmpfiles will still remove our temporary files, ensuring reboots are still accurately detected. Signed-off-by: Matt Heon --- contrib/tmpfile/podman.conf | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/contrib/tmpfile/podman.conf b/contrib/tmpfile/podman.conf index 5cc4c0d70e..afb3d5bb2b 100644 --- a/contrib/tmpfile/podman.conf +++ b/contrib/tmpfile/podman.conf @@ -1,9 +1,16 @@ # /tmp/podman-run-* directory can contain content for Podman containers that have run -# for many days. This following line prevents systemd from removing this content. +# for many days. The following lines prevents systemd from removing this content. +# At the same time, these directories must also be cleaned on reboot. +# Thus, each path has two lines: x to not periodically clean, R! to recursively +# remove on reboot. x /tmp/podman-run-* +R! /tmp/podman-run-* x /tmp/storage-run-* +R! /tmp/storage-run-* x /tmp/containers-user-* +R! /tmp/containers-user-* x /tmp/run-*/libpod +R! /tmp/run-*/libpod D! /var/lib/containers/storage/tmp 0700 root root D! /run/podman 0700 root root D! /var/lib/cni/networks