From: Ondrej Kozina <okozina@redhat.com>
Date: Fri, 13 Oct 2017 13:27:30 +0000 (+0200)
Subject: shared/dissect-image: adapt to LUKS2 format
X-Git-Tag: v236~240^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dd59868b67de77c619b64fc197f5f0299d9e4064;p=platform%2Fupstream%2Fsystemd.git

shared/dissect-image: adapt to LUKS2 format

Load any LUKS format available (and recognized) by libcryptsetup
---

diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c
index 4b59f2c..258e8ca 100644
--- a/src/shared/dissect-image.c
+++ b/src/shared/dissect-image.c
@@ -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;