From: Chris Down <chris@chrisdown.name>
Date: Thu, 19 Mar 2026 13:01:54 +0000 (+0800)
Subject: dissect-image: Fix wrong UUID logged on usr verity partition mismatch
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8a66ad0c66f6912e81d400f4c19baaa0821b190f;p=thirdparty%2Fsystemd.git

dissect-image: Fix wrong UUID logged on usr verity partition mismatch

When there's a partition mismatch the USR_VERITY branch logs usr_uuid in
the mismatch message, but the check is actually against usr_verity_uuid.
---

diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c
index fa38688411b..f81d1f8beca 100644
--- a/src/shared/dissect-image.c
+++ b/src/shared/dissect-image.c
@@ -1488,7 +1488,7 @@ static int dissect_image(
                                 if (!sd_id128_is_null(usr_verity_uuid) && !sd_id128_equal(usr_verity_uuid, id)) {
                                         log_debug("Partition UUID '%s' does not match expected UUID '%s' derived from usr verity hash, ignoring.",
                                                   SD_ID128_TO_UUID_STRING(id),
-                                                  SD_ID128_TO_UUID_STRING(usr_uuid));
+                                                  SD_ID128_TO_UUID_STRING(usr_verity_uuid));
                                         continue;
                                 }