summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFranck Bui <fbui@suse.com>2017-03-30 10:39:16 +0200
committerLennart Poettering <lennart@poettering.net>2017-03-30 10:39:16 +0200
commit9aeac5c62397517cabe829f8642a64246e228b6e (patch)
tree057b8a39c53d77acfde5832e40c3b79955aec6b9
parent3ebfa4df79249e702122d1cebfdc04eba985cae0 (diff)
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.
-rw-r--r--units/serial-getty@.service.m46
1 files changed, 6 insertions, 0 deletions
diff --git a/units/serial-getty@.service.m4 b/units/serial-getty@.service.m4
index 4522d0d2be..609c5b62ee 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