aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSören Tempel <soeren+git@soeren-tempel.net>2018-01-20 00:50:15 +0100
committerSören Tempel <soeren+git@soeren-tempel.net>2018-01-25 10:13:39 +0100
commitd6a68123b9cd3c751ee45a376b01d1b164c0ab5b (patch)
tree71fd7ff2a491b9481c373a10398fab190844c924
parenta7f9fc14390fc1e995ae47ba9634b86d5922dbf7 (diff)
downloadmkinitfs-d6a68123b9cd3c751ee45a376b01d1b164c0ab5b.tar.bz2
mkinitfs-d6a68123b9cd3c751ee45a376b01d1b164c0ab5b.tar.xz
nlplug-findfs: add primitive support for LUKS2 containers
Since we previously specified an explicit request_type for the crypt_load() function nlplug-findfs couldn't open LUKS2 containers. By using CRYPT_LUKS crypt_load accepts any known LUKUS container format. We could add an additional command line flag to nlplug-finds for specifying the request_type but I guess this is good enough for now.
-rw-r--r--nlplug-findfs.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/nlplug-findfs.c b/nlplug-findfs.c
index be525cc..7fb5468 100644
--- a/nlplug-findfs.c
+++ b/nlplug-findfs.c
@@ -582,7 +582,7 @@ static void *cryptsetup_thread(void *data)
goto notify_out;
}
- r = crypt_load(cd, CRYPT_LUKS1, params);
+ r = crypt_load(cd, CRYPT_LUKS, params);
if (r < 0) {
warnx("crypt_load(%s)", data_devnode);
goto free_out;