From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 14 Mar 2025 10:45:20 +0000 (+0100)
Subject: dissect-image: after probing file systems, we still have the chance to not use a... 
X-Git-Tag: v258-rc1~934
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4dba936a03f5350525948901d4bcefe3fece60ac;p=thirdparty%2Fsystemd.git

dissect-image: after probing file systems, we still have the chance to not use a partition

Just because we found something we should still allow it to not be used,
hence include UNUSED in the found flags.
---

diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c
index 8ce71423253..8c8592cc77f 100644
--- a/src/shared/dissect-image.c
+++ b/src/shared/dissect-image.c
@@ -404,11 +404,11 @@ static int dissected_image_probe_filesystems(
 
                 if (streq_ptr(p->fstype, "crypto_LUKS")) {
                         m->encrypted = true;
-                        found_flags = PARTITION_POLICY_ENCRYPTED; /* found this one, and its definitely encrypted */
+                        found_flags = PARTITION_POLICY_UNUSED|PARTITION_POLICY_ENCRYPTED; /* found this one, and its definitely encrypted */
                 } else
                         /* found it, but it's definitely not encrypted, hence mask the encrypted flag, but
                          * set all other ways that indicate "present". */
-                        found_flags = PARTITION_POLICY_UNPROTECTED|PARTITION_POLICY_VERITY|PARTITION_POLICY_SIGNED;
+                        found_flags = PARTITION_POLICY_UNUSED|PARTITION_POLICY_UNPROTECTED|PARTITION_POLICY_VERITY|PARTITION_POLICY_SIGNED;
 
                 if (p->fstype && fstype_is_ro(p->fstype))
                         p->rw = false;