summaryrefslogtreecommitdiff
path: root/tmpfiles.d
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-12-13 02:05:04 +0100
committerLennart Poettering <lennart@poettering.net>2013-12-13 04:06:43 +0100
commit6b46ea73e3b1d8a1e65f58ac04772821bd4a72fb (patch)
tree5fe6a91a2bbb8e87528d68e7aeb2c58086d53d42 /tmpfiles.d
parent6203e07a83214a55bb1f88508fcda2005c601dea (diff)
namespace: include boot id in private tmp directories
This way it is easy to only exclude directories from the current boot from automatic clean up in /var/tmp. Also, pick a longer name for the directories so that are globs in tmp.conf can be simpler yet equally accurate.
Diffstat (limited to 'tmpfiles.d')
-rw-r--r--tmpfiles.d/tmp.conf25
1 files changed, 4 insertions, 21 deletions
diff --git a/tmpfiles.d/tmp.conf b/tmpfiles.d/tmp.conf
index f0312efe90..b80dab4dbf 100644
--- a/tmpfiles.d/tmp.conf
+++ b/tmpfiles.d/tmp.conf
@@ -12,24 +12,7 @@ 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
-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