56 lines
2.5 KiB
Diff
56 lines
2.5 KiB
Diff
|
From e88e3b279784ca801996c5e32db8c3bc2df1ec29 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Leho Kraav <leho@kraav.com>
|
||
|
|
Date: Tue, 24 Jul 2012 15:08:55 +0300
|
||
|
|
Subject: [PATCH] 91crypt-loop: replace basename calls with string matching
|
||
|
|
|
||
|
|
---
|
||
|
|
modules.d/90crypt/crypt-lib.sh | 2 +-
|
||
|
|
modules.d/91crypt-loop/crypt-loop-lib.sh | 8 ++++----
|
||
|
|
2 files changed, 5 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/modules.d/90crypt/crypt-lib.sh b/modules.d/90crypt/crypt-lib.sh
|
||
|
|
index d5caa85..d66ba88 100755
|
||
|
|
--- a/modules.d/90crypt/crypt-lib.sh
|
||
|
|
+++ b/modules.d/90crypt/crypt-lib.sh
|
||
|
|
@@ -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
|
||
|
|
diff --git a/modules.d/91crypt-loop/crypt-loop-lib.sh b/modules.d/91crypt-loop/crypt-loop-lib.sh
|
||
|
|
index 6774e7d..244b6ce 100644
|
||
|
|
--- a/modules.d/91crypt-loop/crypt-loop-lib.sh
|
||
|
|
+++ b/modules.d/91crypt-loop/crypt-loop-lib.sh
|
||
|
|
@@ -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"
|