summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Triplett <josh@joshtriplett.org>2011-08-06 15:48:27 -0700
committerLennart Poettering <lennart@poettering.net>2011-08-24 20:39:33 +0200
commitf08fce88206f7315cff24678590cd73cd5e75f95 (patch)
tree9290a5e625105b4dcf32b75ffa92b2a4b168e05b
parent1c5224b33630a1f95952796b2cb582be052e0c27 (diff)
tmpfiles: Move /tmp and /var/tmp to a separate tmpfiles.d file to ease overrides via /etc
Many people prefer to avoid clearing /tmp and /var/tmp, and distributions often have explicit settings for how often to clear them if at all. Overriding those with systemd currently requires overriding all of /usr/lib/tmpfiles.d/systemd.conf via /etc/tmpfiles.d/systemd.conf, copying across all the other entries, and updating that override when systemd.conf changes. Move the /tmp and /var/tmp entries from systemd.conf to a separate tmp.conf, making them easier to override without affecting the rest of systemd.conf.
-rw-r--r--Makefile.am1
-rw-r--r--tmpfiles.d/systemd.conf3
-rw-r--r--tmpfiles.d/tmp.conf12
3 files changed, 13 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index ef3bd846c6..c1a4a5f1b0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -301,6 +301,7 @@ dist_bashcompletion_DATA = \
dist_tmpfiles_DATA = \
tmpfiles.d/systemd.conf \
+ tmpfiles.d/tmp.conf \
tmpfiles.d/x11.conf
if HAVE_SYSV_COMPAT
diff --git a/tmpfiles.d/systemd.conf b/tmpfiles.d/systemd.conf
index 7d4b356a12..be29c068af 100644
--- a/tmpfiles.d/systemd.conf
+++ b/tmpfiles.d/systemd.conf
@@ -13,9 +13,6 @@ F /run/utmp 0664 root utmp -
f /var/log/wtmp 0664 root utmp -
f /var/log/btmp 0600 root utmp -
-d /tmp 1777 root root 10d
-d /var/tmp 1777 root root 30d
-
d /var/cache/man - - - 30d
r /forcefsck
diff --git a/tmpfiles.d/tmp.conf b/tmpfiles.d/tmp.conf
new file mode 100644
index 0000000000..8915b82ab5
--- /dev/null
+++ b/tmpfiles.d/tmp.conf
@@ -0,0 +1,12 @@
+# This file is part of systemd.
+#
+# systemd is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+
+# 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