Merge pull request #31531 from poettering/verity-userspace-optional

dissect: make use of userspace verity keyring optional
2024-02-28 22:04:58 +01:00
parent e72ae41b51 f0ecff8506
commit 5b97957376
23 changed files with 142 additions and 56 deletions
@@ -2247,7 +2247,8 @@ static int run(int argc, char *argv[]) {
                                DISSECT_IMAGE_VALIDATE_OS |
                                DISSECT_IMAGE_RELAX_VAR_CHECK |
                                DISSECT_IMAGE_FSCK |
-                                DISSECT_IMAGE_GROWFS,
+                                DISSECT_IMAGE_GROWFS |
+                                DISSECT_IMAGE_ALLOW_USERSPACE_VERITY,
                                &mounted_dir,
                                /* ret_dir_fd= */ NULL,
                                &loop_device);