diff -ru cryptsetup-1.6.6.orig/debian/changelog cryptsetup-1.6.6/debian/changelog --- cryptsetup-1.6.6.orig/debian/changelog 2015-08-21 09:59:11.000000000 +0200 +++ cryptsetup-1.6.6/debian/changelog 2015-10-24 20:09:32.254274641 +0200 @@ -1,3 +1,9 @@ +cryptsetup (2:1.6.6-5ubuntu2dave1) UNRELEASED; urgency=medium + + * Use plymouth in decrypt_gnupg, if available. (closes: #885358) + + -- Dave Pifke Sat, 24 Oct 2015 19:36:06 +0200 + cryptsetup (2:1.6.6-5ubuntu2) wily; urgency=medium * Fix stupid typo in Recommends "busybox | busybox-static" inversion. diff -ru cryptsetup-1.6.6.orig/debian/scripts/decrypt_gnupg cryptsetup-1.6.6/debian/scripts/decrypt_gnupg --- cryptsetup-1.6.6.orig/debian/scripts/decrypt_gnupg 2015-03-28 21:38:34.000000000 +0100 +++ cryptsetup-1.6.6/debian/scripts/decrypt_gnupg 2015-10-24 20:09:40.330329736 +0200 @@ -2,7 +2,12 @@ decrypt_gpg () { echo "Performing GPG key decryption ..." >&2 - if ! /lib/cryptsetup/askpass "Enter passphrase for key $1: " | \ + if [ -x /bin/plymouth ] && plymouth --ping; then + askpass="/bin/plymouth ask-for-password --prompt" + else + askpass=/lib/cryptsetup/askpass + fi + if ! $askpass "Enter passphrase for key $1: " | \ /usr/bin/gpg -q --batch --no-options --no-mdc-warning \ --no-random-seed-file --no-default-keyring \ --keyring /dev/null --secret-keyring /dev/null \