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

[thirdparty/systemd.git] / src / partition / repart.c

diff --git a/src/partition/repart.c b/src/partition/repart.c
index 63e9dcfbd163247146257706d1c01efd0deb4c6d..db1d00974e3771058b7122b58b8da69689fe65f7 100644 (file)
--- a/src/partition/repart.c
+++ b/src/partition/repart.c
@@ -6343,7 +6343,7 @@ static int context_fstab(Context *context) {
                 return false;
 
         if (!need_fstab(context)) {
-                log_notice("MountPoint= is not specified for any elligible partitions, not generating %s",
+                log_notice("MountPoint= is not specified for any eligible partitions, not generating %s",
                            arg_generate_fstab);
                 return 0;
         }
@@ -6437,7 +6437,7 @@ static int context_crypttab(Context *context) {
                 return false;
 
         if (!need_crypttab(context)) {
-                log_notice("EncryptedVolume= is not specified for any elligible partitions, not generating %s",
+                log_notice("EncryptedVolume= is not specified for any eligible partitions, not generating %s",
                            arg_generate_crypttab);
                 return 0;
         }
@@ -7952,7 +7952,8 @@ static int run(int argc, char *argv[]) {
                                 DISSECT_IMAGE_GPT_ONLY |
                                 DISSECT_IMAGE_RELAX_VAR_CHECK |
                                 DISSECT_IMAGE_USR_NO_ROOT |
-                                DISSECT_IMAGE_REQUIRE_ROOT,
+                                DISSECT_IMAGE_REQUIRE_ROOT |
+                                DISSECT_IMAGE_ALLOW_USERSPACE_VERITY,
                                 &mounted_dir,
                                 /* ret_dir_fd= */ NULL,
                                 &loop_device);