From 8a66ad0c66f6912e81d400f4c19baaa0821b190f Mon Sep 17 00:00:00 2001 From: Chris Down Date: Thu, 19 Mar 2026 21:01:54 +0800 Subject: [PATCH] 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. --- src/shared/dissect-image.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c index fa38688411..f81d1f8bec 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; }