From 93ca9714e6afa0adc2aa674e2505ca97ca5b91c9 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 29 Sep 2010 01:39:09 +0200
Subject: [PATCH] units: get rid of special setup services for /var/run,
 /var/lock and /tmp, and rely on tmpfiles.d/ instead

---
 Makefile.am            | 13 ++-----------
 units/tmp.service      | 21 ---------------------
 units/var-lock.service | 18 ------------------
 units/var-run.service  | 19 -------------------
 4 files changed, 2 insertions(+), 69 deletions(-)
 delete mode 100644 units/tmp.service
 delete mode 100644 units/var-lock.service
 delete mode 100644 units/var-run.service

diff --git a/Makefile.am b/Makefile.am
index fd163c8f..b3ab5506 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -181,11 +181,8 @@ dist_systemunit_DATA = \
 	units/sys-kernel-security.automount \
 	units/sys-kernel-security.mount \
 	units/tmp.mount \
-	units/tmp.service \
 	units/var-lock.mount \
-	units/var-lock.service \
 	units/var-run.mount \
-	units/var-run.service \
 	units/hwclock-load.service \
 	units/hwclock-save.service \
 	units/sysctl.service \
@@ -1003,15 +1000,11 @@ install-data-hook:
 		rm -f systemd-remount-api-vfs.service \
 			remount-rootfs.service \
 			var-run.mount \
-			var-run.service \
-			var-lock.mount \
-			var-lock.service && \
+			var-lock.mount && \
 		$(LN_S) ../systemd-remount-api-vfs.service systemd-remount-api-vfs.service && \
 		$(LN_S) ../remount-rootfs.service remount-rootfs.service && \
 		$(LN_S) ../var-run.mount var-run.mount && \
-		$(LN_S) ../var-run.service var-run.service && \
-		$(LN_S) ../var-lock.mount var-lock.mount && \
-		$(LN_S) ../var-lock.service var-lock.service )
+		$(LN_S) ../var-lock.mount var-lock.mount )
 	( cd $(DESTDIR)$(sessionunitdir) && \
 		rm -f shutdown.target sockets.target local-fs.target swap.target bluetooth.target printer.target && \
 		$(LN_S) $(systemunitdir)/shutdown.target shutdown.target && \
@@ -1160,7 +1153,5 @@ git-tag:
 
 # Opt out from a few services on Fedora for now, as long as rc.sysinit does this job
 fedora: install
-	rm /lib/systemd/system/local-fs.target.wants/var-run.service
 	rm /lib/systemd/system/local-fs.target.wants/var-run.mount
-	rm /lib/systemd/system/local-fs.target.wants/var-lock.service
 	rm /lib/systemd/system/local-fs.target.wants/var-lock.mount
diff --git a/units/tmp.service b/units/tmp.service
deleted file mode 100644
index 22892394..00000000
--- a/units/tmp.service
+++ /dev/null
@@ -1,21 +0,0 @@
-#  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/var-lock.service b/units/var-lock.service
deleted file mode 100644
index c2e53cdb..00000000
--- a/units/var-lock.service
+++ /dev/null
@@ -1,18 +0,0 @@
-#  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=Lock Directory
-DefaultDependencies=no
-Requires=var-lock.mount
-After=var-lock.mount
-Before=local-fs.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/bin/mkdir -p /var/lock/subsys
diff --git a/units/var-run.service b/units/var-run.service
deleted file mode 100644
index 2cb861ef..00000000
--- a/units/var-run.service
+++ /dev/null
@@ -1,19 +0,0 @@
-#  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=Runtime Directory
-DefaultDependencies=no
-Requires=var-run.mount
-After=var-run.mount
-Before=local-fs.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=/bin/touch /var/run/utmp ; /bin/chmod 0664 /var/run/utmp ; /bin/chown root:utmp /var/run/utmp
-ExecStart=/bin/mkdir /var/run/user ; /bin/chmod 0755 /var/run/user ; -/sbin/restorecon /var/run/user
-- 
2.39.5