From: Daniel Baumann <daniel@debian.org>
Date: Sun, 28 Jun 2009 13:12:05 +0000 (+0200)
Subject: Correcting cryptsetup calls for persistency on luks.
X-Git-Tag: debian/2.0.15-1~298
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=b81fd0c98e5ebc5fa2c5eb4bdb7f5019cd9d6f86;p=live-boot-grml.git

Correcting cryptsetup calls for persistency on luks.
---

diff --git a/scripts/live-helpers b/scripts/live-helpers
index fbf61fe..9c5bf21 100644
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -334,15 +334,8 @@ find_cow_device ()
 				do
 					load_keymap
 
-					echo -n "Enter passphrase for ${pers_label} on ${devname}: " >&6
-					read -s passphrase
-					echo "${passphrase}" > /tmp/passphrase
-					unset passphrase
-					exec 9</tmp/passphrase
-					/sbin/cryptsetup luksOpen ${devname} $(basename ${devname})
+					/lib/cryptsetup/askpass "Enter passphrase for ${pers_label} on ${devname}: " /sbin/cryptsetup -T 1 luksOpen ${devname} $(basename ${devname}) --key-file=-
 					error=${?}
-					exec 9<&-
-					rm -f /tmp/passphrase
 
 					devname="/dev/mapper/$(basename ${devname})"