From: Marcin Krol <hawk@tld-linux.org>
Date: Wed, 1 Mar 2023 00:57:42 +0000 (+0100)
Subject: - disable lock checks (happens on LUKS2 and fails during system boot)
X-Git-Tag: 0.5.3~3
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=6066bc28dc8b40335ea2a4554691900fa6813c8a;p=rc-scripts.git

- disable lock checks (happens on LUKS2 and fails during system boot)
---

diff --git a/rc.d/init.d/cryptsetup b/rc.d/init.d/cryptsetup
index 263a39c..d5ac2c3 100755
--- a/rc.d/init.d/cryptsetup
+++ b/rc.d/init.d/cryptsetup
@@ -105,7 +105,7 @@ init_crypto() {
 			continue
 		fi
 
-		if /sbin/cryptsetup isLuks "$src" 2>/dev/null; then
+		if /sbin/cryptsetup --disable-locks isLuks "$src" 2>/dev/null; then
 			if key_is_random "$key"; then
 				nls "%s: LUKS requires non-random key, skipping" "$dst"
 				ret=1
@@ -114,7 +114,7 @@ init_crypto() {
 			if [ -n "$params" ]; then
 				nls "%s: options are invalid for LUKS partitions, ignoring them" "$dst"
 			fi
-			/sbin/cryptsetup ${key:+-d $key} luksOpen "$src" "$dst" <&1
+			/sbin/cryptsetup --disable-locks ${key:+-d $key} luksOpen "$src" "$dst" <&1
 		fi
 		rc=$?
 		if [ $rc -ne 0 ]; then
@@ -144,7 +144,7 @@ halt_crypto() {
 	[ -z "$dst" -o "${dst#\#}" != "$dst" ] && continue
         if [ -b "/dev/mapper/$dst" ]; then
             if LC_ALL=C /sbin/dmsetup info "$dst" | grep -q '^Open count: *0$'; then
-                /sbin/cryptsetup remove "$dst"
+                /sbin/cryptsetup --disable-locks remove "$dst"
             else
                 fnval=1
             fi