From 581dd40e73fb93002202e15186a9e65e0b449eb2 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>

Date: Thu, 18 Aug 2011 15:55:57 +0200

Subject: [PATCH] 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.

---

 modules.d/90crypt/crypt-lib.sh |    2 +-

 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules.d/90crypt/crypt-lib.sh b/modules.d/90crypt/crypt-lib.sh

index 2797a7a..69f14d0 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"