tmpfiles: integrate kay's directory cleanup code and otherwise beef up tmpfiles quite...

[elogind.git] / units / systemd-tmpfiles-clean.service.in

diff --git a/units/tmpwatch.service b/units/systemd-tmpfiles-clean.service.in
similarity index 71%
rename from units/tmpwatch.service
rename to units/systemd-tmpfiles-clean.service.in
index 636faf9363f8a80a31266588f67d03a4a083a8f3..3b27330e029bc461537c493483ab6fed851d45e4 100644 (file)
--- a/units/tmpwatch.service
+++ b/units/systemd-tmpfiles-clean.service.in
@@ -10,10 +10,10 @@ Description=Cleanup of Temporary Directories
 DefaultDependencies=no
 Wants=local-fs.target
 After=systemd-readahead-collect.service systemd-readahead-replay.service local-fs.target
-Before=basic.target poweroff.service reboot.service halt.service killall.service
+Before=basic.target shutdown.target
+ConditionPathExists=/etc/tmpfiles.d
 
 [Service]
 Type=oneshot
-ExecStart=/usr/sbin/tmpwatch -umc -x /tmp/.X11-unix -x /tmp/.ICE-unix 10d /tmp
-ExecStart=/usr/sbin/tmpwatch -umc 30d /var/tmp
+ExecStart=@rootlibexecdir@/systemd-tmpfiles --clean
 IOSchedulingClass=idle