From a65e34ccb083a03aa8ecbcbf12fc59349802d014 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 10 Jan 2020 12:24:51 +0900 Subject: [PATCH] machinectl: do not ellipsize table when --full is specified --- man/machinectl.xml | 2 +- src/machine/machinectl.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/man/machinectl.xml b/man/machinectl.xml index e1a2da309f7..bfabee346eb 100644 --- a/man/machinectl.xml +++ b/man/machinectl.xml @@ -680,7 +680,7 @@ - Do not ellipsize process tree entries. + Do not ellipsize process tree entries or table. diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c index 4b02b0812d1..7ba51f0e774 100644 --- a/src/machine/machinectl.c +++ b/src/machine/machinectl.c @@ -306,6 +306,9 @@ static int list_machines(int argc, char *argv[], void *userdata) { if (!table) return log_oom(); + if (arg_full) + table_set_width(table, 0); + r = sd_bus_message_enter_container(reply, 'a', "(ssso)"); if (r < 0) return bus_log_parse_error(r); @@ -386,6 +389,9 @@ static int list_images(int argc, char *argv[], void *userdata) { if (!table) return log_oom(); + if (arg_full) + table_set_width(table, 0); + (void) table_set_align_percent(table, TABLE_HEADER_CELL(3), 100); r = sd_bus_message_enter_container(reply, SD_BUS_TYPE_ARRAY, "(ssbttto)");