|
|
|
@ -1144,11 +1144,11 @@ open_luks() {
|
|
|
|
|
fi
|
|
|
|
|
# At this point a candidate key exists (either mounted before or not)
|
|
|
|
|
good_msg "${LUKS_KEY} on device ${REAL_LUKS_KEYDEV} found" ${CRYPT_SILENT}
|
|
|
|
|
if [ "$(echo ${LUKS_KEY} | grep -o '.gpg$')" = ".gpg" ] && [ -e /sbin/gpg ] ; then
|
|
|
|
|
if [ "$(echo ${LUKS_KEY} | grep -o '.gpg$')" = ".gpg" ] && [ -e /usr/bin/gpg ] ; then
|
|
|
|
|
[ -e /dev/tty ] && mv /dev/tty /dev/tty.org
|
|
|
|
|
mknod /dev/tty c 5 1
|
|
|
|
|
cryptsetup_options="${cryptsetup_options} -d -"
|
|
|
|
|
gpg_cmd="/sbin/gpg --logger-file /dev/null --quiet --decrypt ${mntkey}${LUKS_KEY} |"
|
|
|
|
|
gpg_cmd="/usr/bin/gpg --logger-file /dev/null --quiet --decrypt ${mntkey}${LUKS_KEY} |"
|
|
|
|
|
else
|
|
|
|
|
cryptsetup_options="${cryptsetup_options} -d ${mntkey}${LUKS_KEY}"
|
|
|
|
|
fi
|
|
|
|
|