From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Thu, 15 Sep 2022 12:58:25 +0000 (+0200)
Subject: units: add dependency ordering for emergency.service conflicts
X-Git-Tag: v252-rc1~164^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3449814b8bda96e0a7d14fe1287f85ba9b269d8e;p=thirdparty%2Fsystemd.git

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.
---

diff --git a/units/systemd-ask-password-console.path b/units/systemd-ask-password-console.path
index 997fe0ff0c7..5277db9a8de 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 9360bf1d5ab..afd0f0baad7 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 e3b6c61346e..161562a8bdc 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