diff options
| author | Alan Jenkins <alan.christopher.jenkins@gmail.com> | 2017-09-26 19:47:50 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2017-09-26 19:47:50 +0200 |
| commit | 0d18f808a453dff4b47a4929dac6f58271a886f9 (patch) | |
| tree | e4923367c7494e75157753f5ccd0b741671976a0 /units/sysinit.target | |
| parent | Merge pull request #6902 from keszybz/two-property-printing-fixes (diff) | |
| download | systemd-0d18f808a453dff4b47a4929dac6f58271a886f9.tar.xz systemd-0d18f808a453dff4b47a4929dac6f58271a886f9.zip | |
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/sysinit.target')
| -rw-r--r-- | units/sysinit.target | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/units/sysinit.target b/units/sysinit.target index 8d01cbdc1b..ec33503330 100644 --- a/units/sysinit.target +++ b/units/sysinit.target @@ -8,13 +8,6 @@ [Unit] Description=System Initialization Documentation=man:systemd.special(7) -Wants=swap.target local-fs.target -After=swap.target local-fs.target - -# local-fs.target uses OnFailure="emergency.target" to start an emergency -# shell. In that case we also need to cancel everything that relies on -# local-fs.target. Flooding the screen with yellow [DEPEND] failures would -# be unhelpful. Therefore we break the chain here. We use a Wants -# dependency instead of Requires, and use a Conflict with emergency.target, -# so that we are cancelled without actually failing any more units. -Conflicts=emergency.target +Conflicts=emergency.service emergency.target +Wants=local-fs.target swap.target +After=local-fs.target swap.target emergency.service emergency.target |