From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 28 Jan 2025 15:52:01 +0000 (+0100)
Subject: dissect: show basic image data even when can't enter the file systems
X-Git-Tag: v258-rc1~1172
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3568c47664f8019bf07b42ae2c94b79bd0e2c2de;p=thirdparty%2Fsystemd.git

dissect: show basic image data even when can't enter the file systems
---

diff --git a/src/dissect/dissect.c b/src/dissect/dissect.c
index 6d238ecddfb..3fa3ecb8721 100644
--- a/src/dissect/dissect.c
+++ b/src/dissect/dissect.c
@@ -974,6 +974,13 @@ static int action_dissect(
                 printf("     Arch.: %s\n",
                        strna(architecture_to_string(dissected_image_architecture(m))));
 
+                if (!sd_id128_is_null(m->image_uuid))
+                        printf("Image UUID: %s\n",
+                               SD_ID128_TO_UUID_STRING(m->image_uuid));
+
+                if (m->image_name && !streq(m->image_name, bn))
+                        printf("Image Name: %s\n", m->image_name);
+
                 putc('\n', stdout);
                 fflush(stdout);
         }
@@ -993,12 +1000,6 @@ static int action_dissect(
                 return log_error_errno(r, "Failed to acquire image metadata: %m");
         else if (!sd_json_format_enabled(arg_json_format_flags)) {
 
-                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));
-
                 if (m->hostname)
                         printf("  Hostname: %s\n", m->hostname);