Blame 0016-91crypt-loop-replace-basename-calls-with-string-matc.patch

Harald Hoyer 12f6cc
From e88e3b279784ca801996c5e32db8c3bc2df1ec29 Mon Sep 17 00:00:00 2001
Harald Hoyer 12f6cc
From: Leho Kraav <leho@kraav.com>
Harald Hoyer 12f6cc
Date: Tue, 24 Jul 2012 15:08:55 +0300
Harald Hoyer 12f6cc
Subject: [PATCH] 91crypt-loop: replace basename calls with string matching
Harald Hoyer 12f6cc
Harald Hoyer 12f6cc
---
Harald Hoyer 12f6cc
 modules.d/90crypt/crypt-lib.sh           | 2 +-
Harald Hoyer 12f6cc
 modules.d/91crypt-loop/crypt-loop-lib.sh | 8 ++++----
Harald Hoyer 12f6cc
 2 files changed, 5 insertions(+), 5 deletions(-)
Harald Hoyer 12f6cc
Harald Hoyer 12f6cc
diff --git a/modules.d/90crypt/crypt-lib.sh b/modules.d/90crypt/crypt-lib.sh
Harald Hoyer 12f6cc
index d5caa85..d66ba88 100755
Harald Hoyer 12f6cc
--- a/modules.d/90crypt/crypt-lib.sh
Harald Hoyer 12f6cc
+++ b/modules.d/90crypt/crypt-lib.sh
Harald Hoyer 12f6cc
@@ -188,7 +188,7 @@ readkey() {
Harald Hoyer 12f6cc
             if [ -f /lib/dracut-crypt-loop-lib.sh ]; then
Harald Hoyer 12f6cc
                 . /lib/dracut-crypt-loop-lib.sh
Harald Hoyer 12f6cc
                 loop_decrypt "$mntp" "$keypath" "$keydev" "$device"
Harald Hoyer 12f6cc
-                initqueue --onetime --finished --unique --name "crypt-loop-cleanup-99-$(basename $mntp)" \
Harald Hoyer 12f6cc
+                initqueue --onetime --finished --unique --name "crypt-loop-cleanup-99-${mntp##*/}" \
Harald Hoyer 12f6cc
                     $(command -v umount) "$mntp; " $(command -v rmdir) "$mntp"
Harald Hoyer 12f6cc
                 return 0
Harald Hoyer 12f6cc
             else
Harald Hoyer 12f6cc
diff --git a/modules.d/91crypt-loop/crypt-loop-lib.sh b/modules.d/91crypt-loop/crypt-loop-lib.sh
Harald Hoyer 12f6cc
index 6774e7d..244b6ce 100644
Harald Hoyer 12f6cc
--- a/modules.d/91crypt-loop/crypt-loop-lib.sh
Harald Hoyer 12f6cc
+++ b/modules.d/91crypt-loop/crypt-loop-lib.sh
Harald Hoyer 12f6cc
@@ -18,13 +18,13 @@ loop_decrypt() {
Harald Hoyer 12f6cc
     local keydev="$3"
Harald Hoyer 12f6cc
     local device="$4"
Harald Hoyer 12f6cc
 
Harald Hoyer 12f6cc
-    local key="/dev/mapper/$(basename $mntp)"
Harald Hoyer 12f6cc
+    local key="/dev/mapper/${mntp##*/}"
Harald Hoyer 12f6cc
 
Harald Hoyer 12f6cc
     if [ ! -b $key ]; then
Harald Hoyer 12f6cc
         info "Keyfile has .img suffix, treating it as LUKS-encrypted loop keyfile container to unlock $device"
Harald Hoyer 12f6cc
 
Harald Hoyer 12f6cc
         local loopdev=$(losetup -f "${mntp}/${keypath}" --show)
Harald Hoyer 12f6cc
-        local opts="-d - luksOpen $loopdev $(basename $key)"
Harald Hoyer 12f6cc
+        local opts="-d - luksOpen $loopdev ${key##*/}"
Harald Hoyer 12f6cc
 
Harald Hoyer 12f6cc
         ask_for_password \
Harald Hoyer 12f6cc
             --cmd "cryptsetup $opts" \
Harald Hoyer 12f6cc
@@ -33,9 +33,9 @@ loop_decrypt() {
Harald Hoyer 12f6cc
 
Harald Hoyer 12f6cc
         [ -b $key ] || die "Tried setting it up, but keyfile block device was still not found!" 
Harald Hoyer 12f6cc
 
Harald Hoyer 12f6cc
-        initqueue --onetime --finished --unique --name "crypt-loop-cleanup-10-$(basename $key)" \
Harald Hoyer 12f6cc
+        initqueue --onetime --finished --unique --name "crypt-loop-cleanup-10-${key##*/}" \
Harald Hoyer 12f6cc
             $(command -v cryptsetup) "luksClose $key"
Harald Hoyer 12f6cc
-        initqueue --onetime --finished --unique --name "crypt-loop-cleanup-20-$(basename $loopdev)" \
Harald Hoyer 12f6cc
+        initqueue --onetime --finished --unique --name "crypt-loop-cleanup-20-${loopdev##*/}" \
Harald Hoyer 12f6cc
             $(command -v losetup) "-d $loopdev"
Harald Hoyer 12f6cc
     else
Harald Hoyer 12f6cc
         info "Existing keyfile found, re-using it for $device"