Skip to content

Commit a2a334e

Browse files
authored
Merge pull request #519 from 7flying/libcryptsetup-fix
fix: explicitly mark LUKS2 for context load
2 parents 6475106 + 82f73db commit a2a334e

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

client-linuxapp/src/reencrypt/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ fn perform_reencrypt(dev_name: &str) -> Result<()> {
6464
.context("Error opening device")?;
6565

6666
dev.context_handle()
67-
.load::<()>(None, None)
67+
.load::<libcryptsetup_rs::CryptParamsLuks2Ref>(None, None)
6868
.context("Error loading device context")?;
6969

7070
let status = dev

client-linuxapp/src/reencrypt/rebind.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ fn clevis_bind(
154154
log::trace!("Clevis bind successful");
155155

156156
dev.context_handle()
157-
.load::<()>(None, None)
157+
.load::<libcryptsetup_rs::CryptParamsLuks2Ref>(None, None)
158158
.context("Error re-loading device context")?;
159159

160160
log::trace!("Reloaded device context");

client-linuxapp/src/serviceinfo.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ impl DiskEncryptionInProgress {
320320
log::debug!("Device initiated");
321321

322322
dev.context_handle()
323-
.load::<()>(None, None)
323+
.load::<libcryptsetup_rs::CryptParamsLuks2Ref>(None, None)
324324
.context("Error loading device context")?;
325325

326326
log::debug!("Device information loaded");

0 commit comments

Comments
 (0)