]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
analyze: teach "exit-status" verb json output too 30060/head
authorLennart Poettering <lennart@poettering.net>
Mon, 20 Nov 2023 13:52:31 +0000 (14:52 +0100)
committerLennart Poettering <lennart@poettering.net>
Wed, 6 Dec 2023 21:18:14 +0000 (22:18 +0100)
src/analyze/analyze-exit-status.c
src/analyze/analyze.c

index 3a8d3f4b2a976498775c5ad1f3aed9594fab2122..1032f1a4b7af4e7cd3a85113e0cc6f52879fd5eb 100644 (file)
@@ -46,11 +46,9 @@ int verb_exit_status(int argc, char *argv[], void *userdata) {
                                 return table_log_add_error(r);
                 }
 
-        pager_open(arg_pager_flags);
-
-        r = table_print(table, NULL);
+        r = table_print_with_pager(table, arg_json_format_flags, arg_pager_flags, arg_legend);
         if (r < 0)
-                return r;
+                return log_error_errno(r, "Failed to output table: %m");
 
         return EXIT_SUCCESS;
 }
index 2c230e081991d338a6259df5bc7648b2c4540303..005846fdeee3bb99e444ab450b8e4c5035fec264 100644 (file)
@@ -558,9 +558,9 @@ static int parse_argv(int argc, char *argv[]) {
                 return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
                                        "Option --offline= is only supported for security right now.");
 
-        if (arg_json_format_flags != JSON_FORMAT_OFF && !STRPTR_IN_SET(argv[optind], "security", "inspect-elf", "plot", "fdstore", "pcrs", "architectures", "capability"))
+        if (arg_json_format_flags != JSON_FORMAT_OFF && !STRPTR_IN_SET(argv[optind], "security", "inspect-elf", "plot", "fdstore", "pcrs", "architectures", "capability", "exit-status"))
                 return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
-                                       "Option --json= is only supported for security, inspect-elf, plot, fdstore, pcrs, architectures, capability right now.");
+                                       "Option --json= is only supported for security, inspect-elf, plot, fdstore, pcrs, architectures, capability, exit-status right now.");
 
         if (arg_threshold != 100 && !streq_ptr(argv[optind], "security"))
                 return log_error_errno(SYNTHETIC_ERRNO(EINVAL),