diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-09-15 14:58:25 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-09-15 14:59:11 +0200 |
| commit | 3449814b8bda96e0a7d14fe1287f85ba9b269d8e (patch) | |
| tree | 4a13c07f5ddf9e636b9a3721deb67dc73128ecbd /units | |
| parent | 7c0e2b555968d70ac563a37e32a6931ee90961a6 (diff) | |
| download | systemd-3449814b8bda96e0a7d14fe1287f85ba9b269d8e.tar.gz | |
units: add dependency ordering for emergency.service conflicts
If we want to stop those services which would compete for access to
the console, we need to have an ordering so that they are actually
stopped before the other things starts, not asynchronously.
Diffstat (limited to 'units')
| -rw-r--r-- | units/systemd-ask-password-console.path | 1 | ||||
| -rw-r--r-- | units/systemd-ask-password-console.service | 1 | ||||
| -rw-r--r-- | units/systemd-ask-password-wall.path | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/units/systemd-ask-password-console.path b/units/systemd-ask-password-console.path index 997fe0ff0c..5277db9a8d 100644 --- a/units/systemd-ask-password-console.path +++ b/units/systemd-ask-password-console.path @@ -17,6 +17,7 @@ DefaultDependencies=no After=plymouth-start.service Before=paths.target cryptsetup.target Conflicts=emergency.service +Before=emergency.service Conflicts=shutdown.target Before=shutdown.target diff --git a/units/systemd-ask-password-console.service b/units/systemd-ask-password-console.service index 9360bf1d5a..afd0f0baad 100644 --- a/units/systemd-ask-password-console.service +++ b/units/systemd-ask-password-console.service @@ -16,6 +16,7 @@ ConditionPathExists=!/run/plymouth/pid DefaultDependencies=no After=plymouth-start.service systemd-vconsole-setup.service Conflicts=emergency.service +Before=emergency.service Conflicts=shutdown.target initrd-switch-root.target Before=shutdown.target initrd-switch-root.target diff --git a/units/systemd-ask-password-wall.path b/units/systemd-ask-password-wall.path index e3b6c61346..161562a8bd 100644 --- a/units/systemd-ask-password-wall.path +++ b/units/systemd-ask-password-wall.path @@ -14,6 +14,7 @@ Documentation=man:systemd-ask-password-wall.path(8) DefaultDependencies=no Before=paths.target cryptsetup.target Conflicts=emergency.service +Before=emergency.service Conflicts=shutdown.target Before=shutdown.target |