--- /var/abs/base/cryptsetup/encrypt_hook 2006-12-17 01:40:51.000000000 +0100 +++ /lib/initcpio/hooks/encrypt 2007-04-03 04:26:52.000000000 +0200 @@ -41,6 +41,7 @@ [ ! -f ${ckeyfile} ] && echo "Keyfile could not be opened. Reverting to passphrase." fi + if /bin/cryptsetup isLuks ${root} >/dev/null 2>&1; then dopassphrase=1 # If keyfile exists, try to use that @@ -105,6 +106,15 @@ err "Password succeeded, but root creation failed, aborting..." exit 1 fi + elif [ "x${crypto_md}" != "x" ]; then + # test md devices + if /bin/cryptsetup isLuks ${crypto_md} > /dev/null 2>&1; then + echo "" + echo "A password is required to access to the root filesystem:" + while ! eval /bin/cryptsetup luksOpen ${crypto_md} root ${CSQUIET}; do + sleep 2; + done + fi fi nuke ${ckeyfile} fi