nchevsky/systemrescue-zfs
1
0
Fork 0
mirror of https://github.com/nchevsky/systemrescue-zfs.git synced 2026-01-04 07:40:25 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix findroot loop when the password to any encrypted device is unknown (#342)

Browse source 
Do this by asking max 6 times for a password, then continue with the next device.

Also fix a bug when an encrypted device on LVM leads to the same device
name for the encrypted and unencrypted device.
This commit is contained in:
Gerd v. Egidy 2023-09-25 22:28:26 +02:00
parent 99fb673748
commit 4869d2c2f8
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog
View file

@ -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)

13
airootfs/etc/initcpio/hooks/findroot
View file

@ -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..."