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

91crypt-loop: replace basename calls with string matching

master
Leho Kraav 2012-07-24 15:08:55 +03:00 committed by Harald Hoyer
parent df68781fca
commit e88e3b2797
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules.d/90crypt/crypt-lib.sh
View File

@ -188,7 +188,7 @@ readkey() {
if [ -f /lib/dracut-crypt-loop-lib.sh ]; then if [ -f /lib/dracut-crypt-loop-lib.sh ]; then
. /lib/dracut-crypt-loop-lib.sh . /lib/dracut-crypt-loop-lib.sh
loop_decrypt "$mntp" "$keypath" "$keydev" "$device" loop_decrypt "$mntp" "$keypath" "$keydev" "$device"
initqueue --onetime --finished --unique --name "crypt-loop-cleanup-99-$(basename $mntp)" \ initqueue --onetime --finished --unique --name "crypt-loop-cleanup-99-${mntp##*/}" \
$(command -v umount) "$mntp; " $(command -v rmdir) "$mntp" $(command -v umount) "$mntp; " $(command -v rmdir) "$mntp"
return 0 return 0
else else

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

@ -18,13 +18,13 @@ loop_decrypt() {
local keydev="$3" local keydev="$3"
local device="$4" local device="$4"


local key="/dev/mapper/$(basename $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" 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 $(basename $key)" local opts="-d - luksOpen $loopdev ${key##*/}"


ask_for_password \ ask_for_password \
--cmd "cryptsetup $opts" \ --cmd "cryptsetup $opts" \
@ -33,9 +33,9 @@ loop_decrypt() {


[ -b $key ] || die "Tried setting it up, but keyfile block device was still not found!" [ -b $key ] || die "Tried setting it up, but keyfile block device was still not found!"


initqueue --onetime --finished --unique --name "crypt-loop-cleanup-10-$(basename $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-$(basename $loopdev)" \ initqueue --onetime --finished --unique --name "crypt-loop-cleanup-20-${loopdev##*/}" \
$(command -v losetup) "-d $loopdev" $(command -v losetup) "-d $loopdev"
else else
info "Existing keyfile found, re-using it for $device" info "Existing keyfile found, re-using it for $device"