From: Franck Bui <fbui@suse.com>
Date: Thu, 30 Mar 2017 08:39:16 +0000 (+0200)
Subject: serial-getty@.service.m4: add Conflicts=/Before= against rescue.service (#5632)
X-Git-Tag: v234~349
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9aeac5c62397517cabe829f8642a64246e228b6e;p=thirdparty%2Fsystemd.git

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

Commit 5ed020d8d10fc100c68edddb519f085b7397a45c already fixed this issue for
getty@.service but forgot serial console.

Note that this is not needed for emergency target as the sysinit target
conflicts against this target already.
---

diff --git a/units/serial-getty@.service.m4 b/units/serial-getty@.service.m4
index 4522d0d2be3..609c5b62ee2 100644
--- a/units/serial-getty@.service.m4
+++ b/units/serial-getty@.service.m4
@@ -21,6 +21,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
+
 [Service]
 ExecStart=-/sbin/agetty --keep-baud 115200,38400,9600 %I $TERM
 Type=idle