summaryrefslogtreecommitdiff
path: root/units/getty@.service.m4
diff options
context:
space:
mode:
authorAlan Jenkins <alan.christopher.jenkins@gmail.com>2017-09-26 18:47:50 +0100
committerLennart Poettering <lennart@poettering.net>2017-09-26 19:47:50 +0200
commit0d18f808a453dff4b47a4929dac6f58271a886f9 (patch)
treee4923367c7494e75157753f5ccd0b741671976a0 /units/getty@.service.m4
parentdc4a5b4b0607b3c1b24b6ffc5fbb50a7c4d5c345 (diff)
downloadsystemd-0d18f808a453dff4b47a4929dac6f58271a886f9.tar.gz
Revert "units: don't kill the emergency shell when sysinit.target is triggered (#6765)" (#6904)
This reverts commit f1e24a259ca182b6cd8a723a56da43435ce48aac. Oops. # systemctl emergency Failed to start emergency.target: Transaction order is cyclic. See syste... See system logs and 'systemctl status emergency.target' for details. # systemctl status emergency.target ● emergency.target - Emergency Mode Loaded: loaded (/usr/lib/systemd/system/emergency.target; static; vendor preset: disabled) Active: inactive (dead) since Mon 2017-09-25 10:43:02 BST; 2h 42min ago Docs: man:systemd.special(7) systemd[1]: sysinit.target: Found dependency on sysinit.target/stop sysinit.target: Unable to break cycle starting with sysinit.target/stop network.target: Found ordering cycle on wpa_supplicant.service/stop network.target: Found dependency on sysinit.target/stop network.target: Found dependency on emergency.target/start network.target: Found dependency on emergency.service/start network.target: Found dependency on serial-getty@ttyS0.service/stop network.target: Found dependency on systemd-user-sessions.service/stop network.target: Found dependency on network.target/stop network.target: Unable to break cycle starting with network.target/stop IMO #6509 is ugly enough that we should aim to answer it. But it could take some time to investigate, so let's re-open the issue as a first step.
Diffstat (limited to 'units/getty@.service.m4')
-rw-r--r--units/getty@.service.m44
1 files changed, 2 insertions, 2 deletions
diff --git a/units/getty@.service.m4 b/units/getty@.service.m4
index c2665e3f6b..ff1b3c3d87 100644
--- a/units/getty@.service.m4
+++ b/units/getty@.service.m4
@@ -23,8 +23,8 @@ 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 emergency.service
-Before=rescue.service emergency.service
+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