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 997fe0ff0c7db1eb0534cf0d48b23162aa73ad08..5277db9a8de291c87a6e19083edf3a4625aa28b1 100644 (file)
--- 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 9360bf1d5abc19cfabc422ef0a25a4ba30ec79c1..afd0f0baad78467d3dbf1272df63b1cb4441e8d5 100644 (file)
--- 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 e3b6c61346ef4d8a33b0245b04bf5bed3f0e569e..161562a8bdc6780ad284fde1503c22155e178d17 100644 (file)
--- 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