From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 4 Dec 2023 17:28:45 +0000 (+0100)
Subject: dissect-image: move comment to right place
X-Git-Tag: v256-rc1~1503^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F30453%2Fhead;p=thirdparty%2Fsystemd.git

dissect-image: move comment to right place

The image name is extracted from the image path originally passed in,
i.e. not the contents of the image. And the image UUID is directly
retrieved from the partition table, hence also not from the contents.
Let's hence move the comment to separate out the stuff extract from the
file systems (and thus only available when mounting/with privs/with
block devices) from the data available without any of that.
---

diff --git a/src/shared/dissect-image.h b/src/shared/dissect-image.h
index 979fd384fe6..15c0bf72194 100644
--- a/src/shared/dissect-image.h
+++ b/src/shared/dissect-image.h
@@ -103,9 +103,10 @@ struct DissectedImage {
 
         uint32_t sector_size;
 
-        /* Meta information extracted from /etc/os-release and similar */
         char *image_name;
         sd_id128_t image_uuid;
+
+        /* Meta information extracted from /etc/os-release and similar */
         char *hostname;
         sd_id128_t machine_id;
         char **machine_info;