]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
dissect-image: Fix wrong UUID logged on usr verity partition mismatch
authorChris Down <chris@chrisdown.name>
Thu, 19 Mar 2026 13:01:54 +0000 (21:01 +0800)
committerChris Down <chris@chrisdown.name>
Thu, 19 Mar 2026 13:01:54 +0000 (21:01 +0800)
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.

src/shared/dissect-image.c

index fa38688411bdd2798701030fc5dd20f2e6d80f42..f81d1f8beca4ae2afb543c9f49b961729598c720 100644 (file)
@@ -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;
                                 }