]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
dissect: don't show non-JSON arch + sector size in JSON mode
authorLennart Poettering <lennart@poettering.net>
Tue, 10 Oct 2023 14:05:28 +0000 (16:05 +0200)
committerLennart Poettering <lennart@poettering.net>
Tue, 10 Oct 2023 19:44:20 +0000 (21:44 +0200)
src/dissect/dissect.c

index 0b4c5ba22fe5e6eaab7b791c18c5d8936a513ed1..c84325620bbdf5fd9d8f4d5f457b6a2d6e7638a8 100644 (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)