machinectl: optionally output table in JSON

2018-12-03 22:42:38 +01:00
parent e3483674ec
commit ad9d139e02
1 changed files with 7 additions and 1 deletions
@@ -259,7 +259,10 @@ static int show_table(Table *table, const char *word) {

                table_set_header(table, arg_legend);

-                r = table_print(table, NULL);
+                if (OUTPUT_MODE_IS_JSON(arg_output))
+                        r = table_print_json(table, NULL, output_mode_to_json_format_flags(arg_output) | JSON_FORMAT_COLOR_AUTO);
+                else
+                        r = table_print(table, NULL);
                if (r < 0)
                        return log_error_errno(r, "Failed to show table: %m");
        }
@@ -2921,6 +2924,9 @@ static int parse_argv(int argc, char *argv[]) {
                        if (arg_output < 0)
                                return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
                                                       "Unknown output '%s'.", optarg);
+
+                        if (OUTPUT_MODE_IS_JSON(arg_output))
+                                arg_legend = false;
                        break;

                case ARG_NO_PAGER: