930e1b8
From f1d712f9028cec81748102a4b05b09a98cddfc79 Mon Sep 17 00:00:00 2001
930e1b8
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
930e1b8
Date: Sat, 16 Nov 2013 17:29:28 -0500
930e1b8
Subject: [PATCH] tmpfiles: adjust excludes for the new per-service private
930e1b8
 dirs
930e1b8
930e1b8
In d8c9d3a (systemd: use unit name in PrivateTmp directories)
930e1b8
I forgot to update the tmpfiles config.
930e1b8
---
930e1b8
 tmpfiles.d/tmp.conf | 17 +++++++++++++++++
930e1b8
 1 file changed, 17 insertions(+)
930e1b8
930e1b8
diff --git a/tmpfiles.d/tmp.conf b/tmpfiles.d/tmp.conf
930e1b8
index 3b534a1..f0312ef 100644
930e1b8
--- a/tmpfiles.d/tmp.conf
930e1b8
+++ b/tmpfiles.d/tmp.conf
930e1b8
@@ -12,6 +12,23 @@ d /tmp 1777 root root 10d
930e1b8
 d /var/tmp 1777 root root 30d
930e1b8
 
930e1b8
 # Exclude namespace mountpoints created with PrivateTmp=yes
930e1b8
+x /tmp/systemd-*.service-*
930e1b8
+x /var/tmp/systemd-*.service-*
930e1b8
+X /tmp/systemd-*.service-*/tmp
930e1b8
+X /var/tmp/systemd-*.service-*/tmp
930e1b8
+x /tmp/systemd-*.socket-*
930e1b8
+x /var/tmp/systemd-*.socket-*
930e1b8
+X /tmp/systemd-*.socket-*/tmp
930e1b8
+X /var/tmp/systemd-*.socket-*/tmp
930e1b8
+x /tmp/systemd-*.mount-*
930e1b8
+x /var/tmp/systemd-*.mount-*
930e1b8
+X /tmp/systemd-*.mount-*/tmp
930e1b8
+X /var/tmp/systemd-*.mount-*/tmp
930e1b8
+x /tmp/systemd-*.swap-*
930e1b8
+x /var/tmp/systemd-*.swap-*
930e1b8
+X /tmp/systemd-*.swap-*/tmp
930e1b8
+X /var/tmp/systemd-*.swap-*/tmp
930e1b8
+# keep those for compatibility during upgrades
930e1b8
 x /tmp/systemd-private-*
930e1b8
 x /var/tmp/systemd-private-*
930e1b8
 X /tmp/systemd-private-*/tmp