mirror of
https://github.com/dracutdevs/dracut.git
synced 2024-10-27 09:25:21 +03:00
91crypt-loop: replace basename calls with string matching
This commit is contained in:
parent
df68781fca
commit
e88e3b2797
@ -188,7 +188,7 @@ readkey() {
|
||||
if [ -f /lib/dracut-crypt-loop-lib.sh ]; then
|
||||
. /lib/dracut-crypt-loop-lib.sh
|
||||
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"
|
||||
return 0
|
||||
else
|
||||
|
@ -18,13 +18,13 @@ loop_decrypt() {
|
||||
local keydev="$3"
|
||||
local device="$4"
|
||||
|
||||
local key="/dev/mapper/$(basename $mntp)"
|
||||
local key="/dev/mapper/${mntp##*/}"
|
||||
|
||||
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 opts="-d - luksOpen $loopdev $(basename $key)"
|
||||
local opts="-d - luksOpen $loopdev ${key##*/}"
|
||||
|
||||
ask_for_password \
|
||||
--cmd "cryptsetup $opts" \
|
||||
@ -33,9 +33,9 @@ loop_decrypt() {
|
||||
|
||||
[ -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"
|
||||
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"
|
||||
else
|
||||
info "Existing keyfile found, re-using it for $device"
|
||||
|
Loading…
Reference in New Issue
Block a user