shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-13 17:18:18 +03:00
Code

dissect: don't show non-JSON arch + sector size in JSON mode

Browse Source
This commit is contained in:
Lennart Poettering 2023-10-10 16:05:28 +02:00
parent e8868e8354
commit 66cd3537f9
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/dissect/dissect.c
View File

@ -836,15 +836,15 @@ static int action_dissect(DissectedImage *m, LoopDevice *d) {
else if (arg_json_format_flags & JSON_FORMAT_OFF)
printf(" Size: %s\n", FORMAT_BYTES(size));
printf(" Sec. Size: %" PRIu32 "\n", m->sector_size);
if (arg_json_format_flags & JSON_FORMAT_OFF) {
printf(" Sec. Size: %" PRIu32 "\n", m->sector_size);
printf(" Arch.: %s\n",
strna(architecture_to_string(dissected_image_architecture(m))));
printf(" Arch.: %s\n",
strna(architecture_to_string(dissected_image_architecture(m))));
if (arg_json_format_flags & JSON_FORMAT_OFF)
putc('\n', stdout);
fflush(stdout);
fflush(stdout);
}
r = dissected_image_acquire_metadata(m, 0);
if (r == -ENXIO)