fi
# Checking for a luks device
- if [ -e /sbin/cryptsetup ] && /sbin/cryptsetup isLuks ${devname}
+ if [ "${PERSISTENT}" = "cryptsetup" ] && [ -e /sbin/cryptsetup ] && /sbin/cryptsetup isLuks ${devname}
then
while true
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})"
then
# do not mount the device to find for image files
# just skip this
- break
+ continue
fi
case "$(get_fstype ${devname})" in