mirror of
https://github.com/morgan9e/systemd
synced 2026-04-15 00:47:10 +09:00
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).
This commit is contained in:
committed by
Mike Yuan
parent
a609b3eab7
commit
9603fd29f8
@@ -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));
|
||||
|
||||
|
||||
Reference in New Issue
Block a user