summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Gundersen <teg@jklm.no>2012-01-03 00:43:45 +0100
committerTom Gundersen <teg@jklm.no>2012-01-03 17:29:52 +0100
commit3efdfe82da085888354f27565fd9c6fab3c8b5a8 (patch)
treeeeb9cd7ce1cccdee526820de21c471fc694f2b58
parent96ea31d5b40a8cd02c2172451705360ace28ffd6 (diff)
tmpfiles: fix 'd' and 'D' confusion2012.01.2
Never use 'd' with non-empty Age, as the age refers to how old files can be before they are deleted, and 'd' never deletes anything. Also, we never want to delete /run/daemons, except for on boot (and then it must be empty since /run is tmpfs), so change that into 'd'. This makes our files diverge from systemd's again (undoing the previous patch), but I submitted the same fix to systemd, so they should eventually converge again. Signed-off-by: Tom Gundersen <teg@jklm.no>
-rw-r--r--tmpfiles.conf12
1 files changed, 6 insertions, 6 deletions
diff --git a/tmpfiles.conf b/tmpfiles.conf
index cfb788b..0a5056d 100644
--- a/tmpfiles.conf
+++ b/tmpfiles.conf
@@ -3,13 +3,13 @@
#
D /tmp 1777 root root 10d
-D /run/daemons 0755 root root -
+d /run/daemons 0755 root root -
-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
+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
F /run/utmp 0664 root utmp -