From: Amadeusz Żołnowski <aidecoe@aidecoe.name>
Date: Thu, 18 Aug 2011 13:55:57 +0000 (+0200)
Subject: 90crypt: ask_for_password pings plymouthd
X-Git-Tag: 014~130
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=581dd40e73fb93002202e15186a9e65e0b449eb2;p=thirdparty%2Fdracut.git

90crypt: ask_for_password pings plymouthd

If plymouthd is not started, ask_for_password shouldn't try to prompt
for password with GUI and should use text prompt instead.
---

diff --git a/modules.d/90crypt/crypt-lib.sh b/modules.d/90crypt/crypt-lib.sh
index 2797a7a24..69f14d0f8 100755
--- a/modules.d/90crypt/crypt-lib.sh
+++ b/modules.d/90crypt/crypt-lib.sh
@@ -47,7 +47,7 @@ ask_for_password() {
 
     { flock -s 9;
         # Prompt for password with plymouth, if installed and running.
-        if [ -x /bin/plymouth ]; then
+        if [ -x /bin/plymouth ] && /bin/plymouth --ping; then
             /bin/plymouth ask-for-password \
                 --prompt "$ply_prompt" --number-of-tries=$ply_tries \
                 --command="$ply_cmd"