[systemd-commits] tmpfiles.d/tmp.conf

[Zbigniew Jędrzejewski-Szmek]

 tmpfiles.d/tmp.conf |   17 +++++++++++++++++
 1 file changed, 17 insertions(+)

New commits:
commit 87267de89ddce9b1b812b720e1fc9a6cb554236e
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Sat Nov 16 17:29:28 2013 -0500

    tmpfiles: adjust excludes for the new per-service private dirs
    
    In d8c9d3a (systemd: use unit name in PrivateTmp directories)
    I forgot to update the tmpfiles config.

diff --git a/tmpfiles.d/tmp.conf b/tmpfiles.d/tmp.conf
index 3b534a1..f0312ef 100644
--- a/tmpfiles.d/tmp.conf
+++ b/tmpfiles.d/tmp.conf
@@ -12,6 +12,23 @@ d /tmp 1777 root root 10d
 d /var/tmp 1777 root root 30d
 
 # Exclude namespace mountpoints created with PrivateTmp=yes
+x /tmp/systemd-*.service-*
+x /var/tmp/systemd-*.service-*
+X /tmp/systemd-*.service-*/tmp
+X /var/tmp/systemd-*.service-*/tmp
+x /tmp/systemd-*.socket-*
+x /var/tmp/systemd-*.socket-*
+X /tmp/systemd-*.socket-*/tmp
+X /var/tmp/systemd-*.socket-*/tmp
+x /tmp/systemd-*.mount-*
+x /var/tmp/systemd-*.mount-*
+X /tmp/systemd-*.mount-*/tmp
+X /var/tmp/systemd-*.mount-*/tmp
+x /tmp/systemd-*.swap-*
+x /var/tmp/systemd-*.swap-*
+X /tmp/systemd-*.swap-*/tmp
+X /var/tmp/systemd-*.swap-*/tmp
+# keep those for compatibility during upgrades
 x /tmp/systemd-private-*
 x /var/tmp/systemd-private-*
 X /tmp/systemd-private-*/tmp