From: Michal Soltys <soltys@ziu.info>
Date: Tue, 26 Jul 2016 22:57:01 +0000 (+0200)
Subject: vconsole: Don't do static installation under sysinit.target
X-Git-Tag: v232~360^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8125e8d38e3aa099c7dce8b0161997b8842aebdc;p=thirdparty%2Fsystemd.git

vconsole: Don't do static installation under sysinit.target

Udev rules cover all the necessary initializations.

As the service now is neither installed, nor installable - we can
remove explicit dependencies and RemainAfterExit=yes option.
---

diff --git a/Makefile.am b/Makefile.am
index c9fb4917ad4..7535b505fb2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4628,9 +4628,6 @@ nodist_udevrules_DATA += \
 
 nodist_systemunit_DATA += \
 	units/systemd-vconsole-setup.service
-
-SYSINIT_TARGET_WANTS += \
-	systemd-vconsole-setup.service
 endif
 
 EXTRA_DIST += \
diff --git a/units/systemd-vconsole-setup.service.in b/units/systemd-vconsole-setup.service.in
index 6160361871e..2bd1fd1a5d3 100644
--- a/units/systemd-vconsole-setup.service.in
+++ b/units/systemd-vconsole-setup.service.in
@@ -9,11 +9,8 @@
 Description=Setup Virtual Console
 Documentation=man:systemd-vconsole-setup.service(8) man:vconsole.conf(5)
 DefaultDependencies=no
-Conflicts=shutdown.target
-Before=sysinit.target shutdown.target
 ConditionPathExists=/dev/tty0
 
 [Service]
 Type=oneshot
-RemainAfterExit=yes
 ExecStart=@rootlibexecdir@/systemd-vconsole-setup