From: Kay Sievers <kay.sievers@vrfy.org>
Date: Wed, 22 Sep 2010 11:01:15 +0000 (+0200)
Subject: units: add optional tmp.service
X-Git-Tag: v11~99
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=8a7702cd06ee57b512f919f3ccb63785a68639a7;ds=sidebyside

units: add optional tmp.service
---

diff --git a/units/tmp.mount b/units/tmp.mount
index 9752ef81a..8d0b8afb1 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 000000000..22892394f
--- /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 7f69d5eb9..54ad57289 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