From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 23 Jan 2024 10:48:55 +0000 (+0100)
Subject: dissect: show image name separately from filename
X-Git-Tag: v256-rc1~1064
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9603fd29f866e45d33b5c5856f531bf17683b06c;p=thirdparty%2Fsystemd.git

dissect: show image name separately from filename

If the image name is different from the filename then show it in the
output, since it's relevant for finding sysext/confext release files.

(Image name is typically the filename without the ".raw" suffix and
similar).
---

diff --git a/src/dissect/dissect.c b/src/dissect/dissect.c
index f6a8161d408..4e44a237939 100644
--- a/src/dissect/dissect.c
+++ b/src/dissect/dissect.c
@@ -829,7 +829,7 @@ static int action_dissect(DissectedImage *m, LoopDevice *d) {
                 pager_open(arg_pager_flags);
 
         if (arg_json_format_flags & JSON_FORMAT_OFF) {
-                printf("      Name: %s%s%s\n",
+                printf(" File Name: %s%s%s\n",
                        ansi_highlight(), bn, ansi_normal());
 
                 printf("      Size: %s\n",
@@ -860,6 +860,9 @@ static int action_dissect(DissectedImage *m, LoopDevice *d) {
                 return log_error_errno(r, "Failed to acquire image metadata: %m");
         else if (arg_json_format_flags & JSON_FORMAT_OFF) {
 
+                if (m->image_name && !streq(m->image_name, bn))
+                        printf("Image Name: %s\n", m->image_name);
+
                 if (!sd_id128_is_null(m->image_uuid))
                         printf("Image UUID: %s\n", SD_ID128_TO_UUID_STRING(m->image_uuid));