From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 5 Nov 2021 17:04:53 +0000 (+0100)
Subject: user-record: show fs/luks/gpt UUIDs as proper UUIDs
X-Git-Tag: v250-rc1~350
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=30df35869ca7e26b61c02a332521645c768cdaab;p=thirdparty%2Fsystemd.git

user-record: show fs/luks/gpt UUIDs as proper UUIDs

These are not defined by us, but are defined as proper UUIDs by their
respective specs, hence show them as such.
---

diff --git a/src/shared/user-record-show.c b/src/shared/user-record-show.c
index dee6c4e5ee3..92e1d78e862 100644
--- a/src/shared/user-record-show.c
+++ b/src/shared/user-record-show.c
@@ -275,11 +275,11 @@ void user_record_show(UserRecord *hr, bool show_full_group_info) {
                 printf("LUKS Discard: online=%s offline=%s\n", yes_no(user_record_luks_discard(hr)), yes_no(user_record_luks_offline_discard(hr)));
 
                 if (!sd_id128_is_null(hr->luks_uuid))
-                        printf("   LUKS UUID: " SD_ID128_FORMAT_STR "\n", SD_ID128_FORMAT_VAL(hr->luks_uuid));
+                        printf("   LUKS UUID: " SD_ID128_UUID_FORMAT_STR "\n", SD_ID128_FORMAT_VAL(hr->luks_uuid));
                 if (!sd_id128_is_null(hr->partition_uuid))
-                        printf("   Part UUID: " SD_ID128_FORMAT_STR "\n", SD_ID128_FORMAT_VAL(hr->partition_uuid));
+                        printf("   Part UUID: " SD_ID128_UUID_FORMAT_STR "\n", SD_ID128_FORMAT_VAL(hr->partition_uuid));
                 if (!sd_id128_is_null(hr->file_system_uuid))
-                        printf("     FS UUID: " SD_ID128_FORMAT_STR "\n", SD_ID128_FORMAT_VAL(hr->file_system_uuid));
+                        printf("     FS UUID: " SD_ID128_UUID_FORMAT_STR "\n", SD_ID128_FORMAT_VAL(hr->file_system_uuid));
 
                 if (hr->file_system_type)
                         printf(" File System: %s\n", user_record_file_system_type(hr));