From: tblume <Thomas.Blume@suse.com>
Date: Tue, 2 Aug 2016 12:55:25 +0000 (+0200)
Subject: systemd-ask-password: make sure directory watch is started before cryptsetup (#3850)
X-Git-Tag: v232~351
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7633f8ef371a0992374956437fb7bb8189156b10;p=thirdparty%2Fsystemd.git

systemd-ask-password: make sure directory watch is started before cryptsetup (#3850)

The password directory watch should get ordered before cryptsetup to make sure
that the password for unlocking the crypt device gets prompted.
---

diff --git a/units/systemd-ask-password-console.path b/units/systemd-ask-password-console.path
index 2949635feae..7899ae788fa 100644
--- a/units/systemd-ask-password-console.path
+++ b/units/systemd-ask-password-console.path
@@ -11,7 +11,7 @@ Documentation=man:systemd-ask-password-console.service(8)
 DefaultDependencies=no
 Conflicts=shutdown.target
 After=plymouth-start.service
-Before=paths.target shutdown.target
+Before=paths.target shutdown.target cryptsetup.target
 ConditionPathExists=!/run/plymouth/pid
 
 [Path]
diff --git a/units/systemd-ask-password-wall.path b/units/systemd-ask-password-wall.path
index 95ec9bc8a02..a3ca6172568 100644
--- a/units/systemd-ask-password-wall.path
+++ b/units/systemd-ask-password-wall.path
@@ -10,7 +10,7 @@ Description=Forward Password Requests to Wall Directory Watch
 Documentation=man:systemd-ask-password-console.service(8)
 DefaultDependencies=no
 Conflicts=shutdown.target
-Before=paths.target shutdown.target
+Before=paths.target shutdown.target cryptsetup.target
 
 [Path]
 DirectoryNotEmpty=/run/systemd/ask-password