summaryrefslogtreecommitdiff
path: root/tmpfiles.d
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-10-18 22:38:41 +0200
committerLennart Poettering <lennart@poettering.net>2010-10-18 22:38:41 +0200
commit3b63d2d31d0850bd7a81ab9b468218d2c4c461e8 (patch)
tree8c630affc7b088bfa61419b1684a3dd64bb03860 /tmpfiles.d
parent12aad1d075a6cfa23920b977146e79d8154f2540 (diff)
tmpfiles: integrate kay's directory cleanup code and otherwise beef up tmpfiles quite a bit
Diffstat (limited to 'tmpfiles.d')
-rw-r--r--tmpfiles.d/systemd.conf12
-rw-r--r--tmpfiles.d/x11.conf20
2 files changed, 27 insertions, 5 deletions
diff --git a/tmpfiles.d/systemd.conf b/tmpfiles.d/systemd.conf
index ee326f0826..e93b736bec 100644
--- a/tmpfiles.d/systemd.conf
+++ b/tmpfiles.d/systemd.conf
@@ -5,6 +5,12 @@
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
-d /var/lock/subsys 0755 root root
-d /var/run/user 0755 root root
-f /var/run/utmp 0664 root utmp
+d /var/lock/subsys 0755 root root 10d
+d /var/run/user 0755 root root 10d
+F /var/run/utmp 0664 root utmp -
+f /var/log/wtmp 0644 root utmp -
+
+d /tmp 1777 root root 10d
+d /var/tmp 1777 root root 30d
+
+d /var/cache/man - - - 30d
diff --git a/tmpfiles.d/x11.conf b/tmpfiles.d/x11.conf
index d23c052de2..a982d30429 100644
--- a/tmpfiles.d/x11.conf
+++ b/tmpfiles.d/x11.conf
@@ -5,5 +5,21 @@
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
-d /tmp/.X11-unix 1777 root root
-d /tmp/.ICE-unix 1777 root root
+# Make sure these are created by default so that nobody else can
+d /tmp/.X11-unix 1777 root root 10d
+d /tmp/.ICE-unix 1777 root root 10d
+d /tmp/.XIM-unix 1777 root root 10d
+d /tmp/.font-unix 1777 root root 10d
+d /tmp/.Test-unix 1777 root root 10d
+
+# Unlink the X11 lock files
+r /tmp/.X0-lock
+r /tmp/.X1-lock
+r /tmp/.X2-lock
+r /tmp/.X3-lock
+r /tmp/.X4-lock
+r /tmp/.X5-lock
+r /tmp/.X6-lock
+r /tmp/.X7-lock
+r /tmp/.X8-lock
+r /tmp/.X9-lock