summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Soltys <soltys@ziu.info>2016-07-25 16:18:00 +0200
committerLennart Poettering <lennart@poettering.net>2016-07-25 16:18:00 +0200
commit5ed020d8d10fc100c68edddb519f085b7397a45c (patch)
tree62e279a78acde093fb93e0ac2a2ea76b5494dd87
parente9baf6963af30f293d05079222e2881b0989ed1a (diff)
downloadsystemd-5ed020d8d10fc100c68edddb519f085b7397a45c.tar.gz
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).
-rw-r--r--units/getty@.service.m46
1 files changed, 6 insertions, 0 deletions
diff --git a/units/getty@.service.m4 b/units/getty@.service.m4
index 46164ab9d8..5b82c13fc5 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.