eessppeelllloo/cryptsetup
1
0
Fork 0
mirror of https://gitlab.com/cryptsetup/cryptsetup.git synced 2025-12-11 19:00:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

luks2: move pre-activation requirements check lower

Browse Source
This commit is contained in:
Ondrej Kozina
2017-09-26 18:13:33 +02:00
committed by Milan Broz
parent 9bbc13f256
commit c015aeca4e
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/luks2/luks2_json_metadata.c
View File

@@ -1734,6 +1734,10 @@ int LUKS2_activate(struct crypt_device *cd,
char dm_int_name[PATH_MAX], dm_int_dev_name[PATH_MAX];
struct device *device = NULL;
/* do not allow activation when particular requirements detected */
if ((r = LUKS2_unmet_requirements(cd, hdr, 0)))
return r;
/* Add persistent activation flags */
if (!(flags & CRYPT_ACTIVATE_IGNORE_PERSISTENT))
LUKS2_config_get_flags(cd, hdr, &dmd.flags);