Skip to content

Commit 460ce98

Browse files
poetteringbluca
authored andcommitted
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. (cherry picked from commit 3f8229f) (cherry picked from commit 09dab16) (cherry picked from commit b945258)
1 parent 053c90d commit 460ce98

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

src/shared/dissect-image.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,10 @@ struct DissectedImage {
9595

9696
uint32_t sector_size;
9797

98-
/* Meta information extracted from /etc/os-release and similar */
9998
char *image_name;
10099
sd_id128_t image_uuid;
100+
101+
/* Meta information extracted from /etc/os-release and similar */
101102
char *hostname;
102103
sd_id128_t machine_id;
103104
char **machine_info;

0 commit comments

Comments
 (0)