From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 10 Jan 2020 03:24:51 +0000 (+0900)
Subject: machinectl: do not ellipsize table when --full is specified
X-Git-Tag: v245-rc1~151^2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a65e34ccb083a03aa8ecbcbf12fc59349802d014;p=thirdparty%2Fsystemd.git

machinectl: do not ellipsize table when --full is specified
---

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 @@
         <term><option>-l</option></term>
         <term><option>--full</option></term>
 
-        <listitem><para>Do not ellipsize process tree entries.</para>
+        <listitem><para>Do not ellipsize process tree entries or table.</para>
         </listitem>
       </varlistentry>
 
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)");