Blame 0010-90crypt-ask_for_password-pings-plymouthd.patch

Harald Hoyer 55891e
From 581dd40e73fb93002202e15186a9e65e0b449eb2 Mon Sep 17 00:00:00 2001
Harald Hoyer 55891e
From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
Harald Hoyer 55891e
Date: Thu, 18 Aug 2011 15:55:57 +0200
Harald Hoyer 55891e
Subject: [PATCH] 90crypt: ask_for_password pings plymouthd
Harald Hoyer 55891e
Harald Hoyer 55891e
If plymouthd is not started, ask_for_password shouldn't try to prompt
Harald Hoyer 55891e
for password with GUI and should use text prompt instead.
Harald Hoyer 55891e
---
Harald Hoyer 55891e
 modules.d/90crypt/crypt-lib.sh |    2 +-
Harald Hoyer 55891e
 1 files changed, 1 insertions(+), 1 deletions(-)
Harald Hoyer 55891e
Harald Hoyer 55891e
diff --git a/modules.d/90crypt/crypt-lib.sh b/modules.d/90crypt/crypt-lib.sh
Harald Hoyer 55891e
index 2797a7a..69f14d0 100755
Harald Hoyer 55891e
--- a/modules.d/90crypt/crypt-lib.sh
Harald Hoyer 55891e
+++ b/modules.d/90crypt/crypt-lib.sh
Harald Hoyer 55891e
@@ -47,7 +47,7 @@ ask_for_password() {
Harald Hoyer 55891e
 
Harald Hoyer 55891e
     { flock -s 9;
Harald Hoyer 55891e
         # Prompt for password with plymouth, if installed and running.
Harald Hoyer 55891e
-        if [ -x /bin/plymouth ]; then
Harald Hoyer 55891e
+        if [ -x /bin/plymouth ] && /bin/plymouth --ping; then
Harald Hoyer 55891e
             /bin/plymouth ask-for-password \
Harald Hoyer 55891e
                 --prompt "$ply_prompt" --number-of-tries=$ply_tries \
Harald Hoyer 55891e
                 --command="$ply_cmd"