picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

shared/dissect-image: adapt to LUKS2 format 

Load any LUKS format available (and recognized) by libcryptsetup
This commit is contained in:
Ondrej Kozina 2017-10-13 15:27:30 +02:00
parent b3b4ebab02
commit dd59868b67
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/shared/dissect-image.c
View File

@ -19,6 +19,9 @@
#if HAVE_LIBCRYPTSETUP
#include <libcryptsetup.h>
#ifndef CRYPT_LUKS
#define CRYPT_LUKS NULL
#endif
#endif
#include <sys/mount.h>
@ -843,7 +846,7 @@ static int decrypt_partition(
if (r < 0)
return log_debug_errno(r, "Failed to initialize dm-crypt: %m");
r = crypt_load(cd, CRYPT_LUKS1, NULL);
r = crypt_load(cd, CRYPT_LUKS, NULL);
if (r < 0) {
log_debug_errno(r, "Failed to load LUKS metadata: %m");
goto fail;