From: Amadeusz Żołnowski <aidecoe@aidecoe.name>
Date: Thu, 30 Jun 2011 21:49:20 +0000 (+0200)
Subject: crypt: dropped plymouth --has-active-vt check on passwd prompt
X-Git-Tag: 011~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b52294d00bcba2cdca49a0360dadeaf399292f0b;p=thirdparty%2Fdracut.git

crypt: dropped plymouth --has-active-vt check on passwd prompt

As Ray Strode explains, plymouth --has-active-vt may fail if the user
passes console=ttyS0 or something other not corresponding to
console=tty0, because plymouth is outputing to the serial console and
not a VT in this case.
---

diff --git a/modules.d/90crypt/crypt-lib.sh b/modules.d/90crypt/crypt-lib.sh
index 6680e2aca..2797a7a24 100644
--- 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 ] && /bin/plymouth --has-active-vt; then
+        if [ -x /bin/plymouth ]; then
             /bin/plymouth ask-for-password \
                 --prompt "$ply_prompt" --number-of-tries=$ply_tries \
                 --command="$ply_cmd"