kernel
/
dracut
mirror of https://git.kernel.org/pub/scm/boot/dracut/dracut.git/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #44 from MrStaticVoid/fix-crypt-loop-info-log-level 

crypt-loop: Fix decrypt when running at info log level
master
Harald Hoyer 2015-06-02 11:49:25 +02:00
parent d6e23c46c2 c902aba0d4
commit 8c5d18c2cb
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules.d/91crypt-loop/crypt-loop-lib.sh
View File

@ -19,8 +19,6 @@ loop_decrypt() {
local key="/dev/mapper/${mntp##*/}" local key="/dev/mapper/${mntp##*/}"


if [ ! -b $key ]; then if [ ! -b $key ]; then
info "Keyfile has .img suffix, treating it as LUKS-encrypted loop keyfile container to unlock $device"

local loopdev=$(losetup -f "${mntp}/${keypath}" --show) local loopdev=$(losetup -f "${mntp}/${keypath}" --show)
local opts="-d - luksOpen $loopdev ${key##*/}" local opts="-d - luksOpen $loopdev ${key##*/}"


@ -29,14 +27,12 @@ loop_decrypt() {
--prompt "Password ($keypath on $keydev for $device)" \ --prompt "Password ($keypath on $keydev for $device)" \
--tty-echo-off --tty-echo-off


[ -b $key ] || die "Tried setting it up, but keyfile block device was still not found!" [ -b $key ] || die "Failed to unlock $keypath on $keydev for $device."


initqueue --onetime --finished --unique --name "crypt-loop-cleanup-10-${key##*/}" \ initqueue --onetime --finished --unique --name "crypt-loop-cleanup-10-${key##*/}" \
$(command -v cryptsetup) "luksClose $key" $(command -v cryptsetup) "luksClose $key"
initqueue --onetime --finished --unique --name "crypt-loop-cleanup-20-${loopdev##*/}" \ initqueue --onetime --finished --unique --name "crypt-loop-cleanup-20-${loopdev##*/}" \
$(command -v losetup) "-d $loopdev" $(command -v losetup) "-d $loopdev"
else
info "Existing keyfile found, re-using it for $device"
fi fi


cat $key cat $key