Adding missing pipe in cryptsetup call for persistency on luks partitions.

[live-boot-grml.git] / scripts / live-helpers

diff --git a/scripts/live-helpers b/scripts/live-helpers
index 79b158c..35fb8cf 100644 (file)
--- a/scripts/live-helpers
+++ b/scripts/live-helpers
@@ -104,7 +104,7 @@ where_is_mounted ()
        if grep -q "^${device} " /proc/mounts
        then
                # return the first found
-               grep "^${device} " /proc/mounts | cut -f2 -d ' '
+               grep -m1 "^${device} " /proc/mounts | cut -f2 -d ' '
        fi
 }
 
@@ -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})"