From: Michal Soltys <soltys@ziu.info>
Date: Mon, 25 Jul 2016 14:18:00 +0000 (+0200)
Subject: getty@.service.m4: add Conflicts=/Before= against rescue.service (#3792)
X-Git-Tag: v231~12
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5ed020d8d10fc100c68edddb519f085b7397a45c;p=thirdparty%2Fsystemd.git

getty@.service.m4: add Conflicts=/Before= against rescue.service (#3792)

If user isolates rescue target from multi-user or graphical target (or just
starts the service), IgnoreOnIsolate will cause issues with sulogin which is
directly started on current virtual console. This patch adds necessary
Conflicts= and Before= against rescue.service.

Note that this is not needed for emergency target, as implicit Requires= and
After= against sysinit.target is in effect for this service
(DefaultDependencies=yes).
---

diff --git a/units/getty@.service.m4 b/units/getty@.service.m4
index 46164ab9d80..5b82c13fc5e 100644
--- a/units/getty@.service.m4
+++ b/units/getty@.service.m4
@@ -20,6 +20,12 @@ After=rc-local.service
 Before=getty.target
 IgnoreOnIsolate=yes
 
+# IgnoreOnIsolate causes issues with sulogin, if someone isolates
+# rescue.target or starts rescue.service from multi-user.target or
+# graphical.target.
+Conflicts=rescue.service
+Before=rescue.service
+
 # On systems without virtual consoles, don't start any getty. Note
 # that serial gettys are covered by serial-getty@.service, not this
 # unit.