summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKay Sievers <kay.sievers@vrfy.org>2010-09-22 13:01:15 +0200
committerKay Sievers <kay.sievers@vrfy.org>2010-09-22 13:01:15 +0200
commit8a7702cd06ee57b512f919f3ccb63785a68639a7 (patch)
tree60c61f599c6d846eca3a155cad15bb0619729b39
parent45cf9716724eb949982d311e94cbd257b7b387bc (diff)
units: add optional tmp.service
-rw-r--r--units/tmp.mount3
-rw-r--r--units/tmp.service21
-rw-r--r--units/tmpwatch.timer1
3 files changed, 21 insertions, 4 deletions
diff --git a/units/tmp.mount b/units/tmp.mount
index 9752ef81a2..8d0b8afb17 100644
--- a/units/tmp.mount
+++ b/units/tmp.mount
@@ -14,6 +14,3 @@ What=tmpfs
Where=/tmp
Type=tmpfs
Options=mode=1777
-
-[Install]
-WantedBy=local-fs.target
diff --git a/units/tmp.service b/units/tmp.service
new file mode 100644
index 0000000000..22892394f9
--- /dev/null
+++ b/units/tmp.service
@@ -0,0 +1,21 @@
+# 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.
+
+[Unit]
+Description=Temporary Directory
+DefaultDependencies=no
+Requires=tmp.mount
+After=tmp.mount
+Before=local-fs.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/bin/mkdir -p -m1777 /tmp/.X11-unix /tmp/.ICE-unix ; -/sbin/restorecon /tmp/.X11-unix /tmp/.ICE-unix
+
+[Install]
+WantedBy=local-fs.target
diff --git a/units/tmpwatch.timer b/units/tmpwatch.timer
index 7f69d5eb95..54ad57289c 100644
--- a/units/tmpwatch.timer
+++ b/units/tmpwatch.timer
@@ -7,7 +7,6 @@
[Unit]
Description=Daily Cleanup of Temporary Directories
-DefaultDependencies=no
[Timer]
OnBootSec=1d