diff --git a/ChangeLog b/ChangeLog index 0f18209..984a0bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -4,6 +4,7 @@ SystemRescue ChangeLog ------------------------------------------------------------------------------ 10.03 (YYYY-MM-DD): ------------------------------------------------------------------------------ +* Fix findroot loop when the password to any encrypted device is unknown (#342) * Fix using findroot when /sbin/init is an absolute symlink (#340) * Added sleuthkit (Tools for raw file system inspection) (#349) * Added timeshift (snapshot-based backup solution) (#350) diff --git a/airootfs/etc/initcpio/hooks/findroot b/airootfs/etc/initcpio/hooks/findroot index 9934ed7..0a49213 100644 --- a/airootfs/etc/initcpio/hooks/findroot +++ b/airootfs/etc/initcpio/hooks/findroot @@ -17,12 +17,15 @@ run_hook() { if cryptsetup isLuks ${curdev} >/dev/null 2>&1 then echo "A passphrase is required to access device ${curdev}:" - local cryptname="${curdev##*/}" + local cryptname="luks-${curdev##*/}" local cryptargs="" - while ! eval cryptsetup open --type luks ${curdev} ${cryptname} ${cryptargs} - do - sleep 2; - done + if ! cryptsetup open --type luks ${curdev} ${cryptname} ${cryptargs}; then + if ! cryptsetup open --type luks ${curdev} ${cryptname} ${cryptargs}; then + # each cryptsetup call offers 3 tries to enter a valid password + # all 6 failed failed, so continue with the next device + continue + fi + fi if [ ! -e "/dev/mapper/${cryptname}" ] then err "Password succeeded but ${cryptname} creation failed, aborting..."