From: Kay Sievers <kay.sievers@vrfy.org>
Date: Tue, 21 Sep 2010 19:43:40 +0000 (+0200)
Subject: units: enable var-run + var-lock service by default
X-Git-Tag: v11~102
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=65ae3821ff45cf65e53cab82a81ea00cfec942a8;p=thirdparty%2Fsystemd.git

units: enable var-run + var-lock service by default
---

diff --git a/Makefile.am b/Makefile.am
index d233da6ca58..f5d46904afc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -905,6 +905,7 @@ install-data-hook:
 		$(DESTDIR)$(systemunitdir)/sockets.target.wants \
 		$(DESTDIR)$(systemunitdir)/sysinit.target.wants \
 		$(DESTDIR)$(systemunitdir)/shutdown.target.wants \
+		$(DESTDIR)$(systemunitdir)/local-fs.target.wants \
 		$(DESTDIR)$(systemunitdir)/runlevel1.target.wants \
 		$(DESTDIR)$(systemunitdir)/runlevel2.target.wants \
 		$(DESTDIR)$(systemunitdir)/runlevel3.target.wants \
@@ -946,6 +947,12 @@ install-data-hook:
 		$(LN_S) ../systemd-update-utmp-shutdown.service && \
 		$(LN_S) ../hwclock-save.service && \
 		$(LN_S) ../systemd-random-seed-save.service )
+	( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \
+		rm -f systemd-update-utmp-shutdown.service \
+			var-run.service \
+			var-lock.service && \
+		$(LN_S) ../var-run.service && \
+		$(LN_S) ../var-lock.service )
 	( 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 && \
diff --git a/units/var-lock.mount b/units/var-lock.mount
index 17c4f522ad7..f14ea94d043 100644
--- a/units/var-lock.mount
+++ b/units/var-lock.mount
@@ -14,6 +14,3 @@ What=tmpfs
 Where=/var/lock
 Type=tmpfs
 Options=mode=775,gid=lock
-
-[Install]
-WantedBy=local-fs.target
diff --git a/units/var-lock.service b/units/var-lock.service
index 9c307e109c5..c2e53cdb36b 100644
--- a/units/var-lock.service
+++ b/units/var-lock.service
@@ -16,6 +16,3 @@ Before=local-fs.target
 Type=oneshot
 RemainAfterExit=yes
 ExecStart=/bin/mkdir -p /var/lock/subsys
-
-[Install]
-WantedBy=local-fs.target
diff --git a/units/var-run.mount b/units/var-run.mount
index 90dfe0edaa0..f7862895366 100644
--- a/units/var-run.mount
+++ b/units/var-run.mount
@@ -14,6 +14,3 @@ What=tmpfs
 Where=/var/run
 Type=tmpfs
 Options=mode=755
-
-[Install]
-WantedBy=local-fs.target
diff --git a/units/var-run.service b/units/var-run.service
index f493ee8ec1e..2cb861efc23 100644
--- a/units/var-run.service
+++ b/units/var-run.service
@@ -17,6 +17,3 @@ 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
-
-[Install]
-WantedBy=local-fs.target