summaryrefslogtreecommitdiff
path: root/tmpfiles.d/tmp.conf
diff options
context:
space:
mode:
authorFranck Bui <fbui@suse.com>2019-04-12 14:45:53 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2019-04-13 12:07:03 +0200
commit63f28cad3e9b7a899606f9cf85f8e649b92b0b89 (patch)
tree8e8bdc6daaf46c0396a78ef2809bee2e8f0e905e /tmpfiles.d/tmp.conf
parent8f1ed04ad6646aeb1f2f28d485b17110c084de5b (diff)
downloadsystemd-63f28cad3e9b7a899606f9cf85f8e649b92b0b89.tar.gz
tmpfiles: split tmp.conf out
tmp.conf was dealing with 2 different kind of paths: one dealing with general temporary paths such as /var/tmp and /tmp and the other one dealing with temporary directories owned by systemd. If for example a user wants to adjust the age argument of the general paths only, he had to overload the whole file which is cumbersome and error prone since any future changes in tmp.conf shipped by systemd will be lost. So this patch splits out tmp.conf so the systemd directories are dealt separately in a dedicated conf file. It's named "systemd-tmp.conf" based on the naming recommendation made in tmpfiles.d man page. In practice it shouldn't cause any regression since it's very unlikely that users override paths owned by systemd.
Diffstat (limited to 'tmpfiles.d/tmp.conf')
-rw-r--r--tmpfiles.d/tmp.conf10
1 files changed, 0 insertions, 10 deletions
diff --git a/tmpfiles.d/tmp.conf b/tmpfiles.d/tmp.conf
index 22555a0076..fe5225d751 100644
--- a/tmpfiles.d/tmp.conf
+++ b/tmpfiles.d/tmp.conf
@@ -10,13 +10,3 @@
# Clear tmp directories separately, to make them easier to override
q /tmp 1777 root root 10d
q /var/tmp 1777 root root 30d
-
-# Exclude namespace mountpoints created with PrivateTmp=yes
-x /tmp/systemd-private-%b-*
-X /tmp/systemd-private-%b-*/tmp
-x /var/tmp/systemd-private-%b-*
-X /var/tmp/systemd-private-%b-*/tmp
-
-# Remove top-level private temporary directories on each boot
-R! /tmp/systemd-private-*
-R! /var/tmp/systemd-private-*