[SCM] Debian Live initramfs hook branch, master, updated. 1.157.2-1-19-gd6df808

[Daniel Baumann]

The following commit has been merged in the master branch:
commit d6df808045a033b717c2a9a903ed4f9cbb7c67a4
Author: Daniel Baumann <daniel at debian.org>
Date:   Sun Jun 28 15:12:05 2009 +0200

    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})"
 

-- 
Debian Live initramfs hook