From 690b24f02fa00350845ab78c0d6c2ad422761a95 Mon Sep 17 00:00:00 2001 From: Steven Brudenell Date: Thu, 27 Jul 2017 18:35:05 -0400 Subject: [PATCH 1/3] Support crypto loop keys in initrd. --- modules.d/91crypt-loop/crypt-loop-lib.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/91crypt-loop/crypt-loop-lib.sh b/modules.d/91crypt-loop/crypt-loop-lib.sh index dc9d24b5..b70668d2 100755 --- a/modules.d/91crypt-loop/crypt-loop-lib.sh +++ b/modules.d/91crypt-loop/crypt-loop-lib.sh @@ -16,7 +16,7 @@ loop_decrypt() { local keydev="$3" local device="$4" - local key="/dev/mapper/${mntp##*/}" + local key="/dev/mapper/$(str_replace "loop-keydev-$mntp-$keypath" '/' '-')" if [ ! -b $key ]; then local loopdev=$(losetup -f "${mntp}/${keypath}" --show) From e2b877a18bfc3d246b0b0b7db60d9b82cc2c593b Mon Sep 17 00:00:00 2001 From: Steven Brudenell Date: Fri, 28 Jul 2017 12:19:47 -0400 Subject: [PATCH 2/3] Change mntp->keydev in loopback key luks name. --- modules.d/91crypt-loop/crypt-loop-lib.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/91crypt-loop/crypt-loop-lib.sh b/modules.d/91crypt-loop/crypt-loop-lib.sh index b70668d2..f2f10583 100755 --- a/modules.d/91crypt-loop/crypt-loop-lib.sh +++ b/modules.d/91crypt-loop/crypt-loop-lib.sh @@ -16,7 +16,7 @@ loop_decrypt() { local keydev="$3" local device="$4" - local key="/dev/mapper/$(str_replace "loop-keydev-$mntp-$keypath" '/' '-')" + local key="/dev/mapper/$(str_replace "loop-keydev-$keydev-$keypath" '/' '-')" if [ ! -b $key ]; then local loopdev=$(losetup -f "${mntp}/${keypath}" --show) From c427603cd19e89d21f16774a8e10171f9791e7b8 Mon Sep 17 00:00:00 2001 From: Steven Brudenell Date: Thu, 3 Aug 2017 21:39:55 -0400 Subject: [PATCH 3/3] Include both and in luks key name. --- modules.d/91crypt-loop/crypt-loop-lib.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules.d/91crypt-loop/crypt-loop-lib.sh b/modules.d/91crypt-loop/crypt-loop-lib.sh index f2f10583..8bfc39e0 100755 --- a/modules.d/91crypt-loop/crypt-loop-lib.sh +++ b/modules.d/91crypt-loop/crypt-loop-lib.sh @@ -16,7 +16,7 @@ loop_decrypt() { local keydev="$3" local device="$4" - local key="/dev/mapper/$(str_replace "loop-keydev-$keydev-$keypath" '/' '-')" + local key="/dev/mapper/$(str_replace "loop-$keydev-$mntp-$keypath" '/' '-')" if [ ! -b $key ]; then local loopdev=$(losetup -f "${mntp}/${keypath}" --show)