You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
26 lines
953 B
26 lines
953 B
From c6dc8dd86c797b982d47ebb918367b4575d59dad Mon Sep 17 00:00:00 2001 |
|
From: Ondrej Kozina <okozina@redhat.com> |
|
Date: Mon, 9 Jul 2018 18:43:02 +0200 |
|
Subject: [PATCH 6/6] Allow LUKS2 repair with disabled locks. |
|
|
|
--- |
|
lib/luks2/luks2_disk_metadata.c | 3 ++- |
|
1 file changed, 2 insertions(+), 1 deletion(-) |
|
|
|
diff --git a/lib/luks2/luks2_disk_metadata.c b/lib/luks2/luks2_disk_metadata.c |
|
index 6ca9d5e..bd5223f 100644 |
|
--- a/lib/luks2/luks2_disk_metadata.c |
|
+++ b/lib/luks2/luks2_disk_metadata.c |
|
@@ -592,7 +592,8 @@ int LUKS2_disk_hdr_read(struct crypt_device *cd, struct luks2_hdr *hdr, |
|
int i, r; |
|
uint64_t hdr_size; |
|
|
|
- if (do_recovery && !crypt_metadata_locking_enabled()) { |
|
+ /* Skip auto-recovery if locks are disabled and we're not doing LUKS2 explicit repair */ |
|
+ if (do_recovery && do_blkprobe && !crypt_metadata_locking_enabled()) { |
|
do_recovery = 0; |
|
log_dbg("Disabling header auto-recovery due to locking being disabled."); |
|
} |
|
-- |
|
1.8.3.1 |
|
|
|
|