Merge pull request #7089 from oniko/luks2-support

LUKS2 support for systemd-cryptsetup and dissect-image

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>
 
@@ -856,7 +859,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;