X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=tmpfiles.d%2Ftmp.conf;h=ffdd82fd9cf5352188513fde77ed01b15f129c8c;hp=f0312efe903ade3f6e3dda7b039d236d79cb90d9;hb=6fc25464bf64b5df2f0efda70bc5c497914108c8;hpb=87267de89ddce9b1b812b720e1fc9a6cb554236e

diff --git a/tmpfiles.d/tmp.conf b/tmpfiles.d/tmp.conf
index f0312efe9..ffdd82fd9 100644
--- a/tmpfiles.d/tmp.conf
+++ b/tmpfiles.d/tmp.conf
@@ -8,28 +8,11 @@
 # See tmpfiles.d(5) for details
 
 # Clear tmp directories separately, to make them easier to override
-d /tmp 1777 root root 10d
-d /var/tmp 1777 root root 30d
+v /tmp 1777 root root 10d
+v /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
-X /var/tmp/systemd-private-*/tmp
+x /tmp/systemd-private-%b-*
+X /tmp/systemd-private-%b-*/tmp
+x /var/tmp/systemd-private-%b-*
+X /var/tmp/systemd-private-%b-*/tmp