From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 10 Jan 2020 10:17:26 +0000 (+0900)
Subject: machinectl: do not truncate addresses when --full is specified
X-Git-Tag: v245-rc1~151^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=12845a91b5c6360ab4a0dd04ea836d4bc9eaeba4;p=thirdparty%2Fsystemd.git

machinectl: do not truncate addresses when --full is specified
---

diff --git a/man/machinectl.xml b/man/machinectl.xml
index bfabee346eb..5d7a14d2c74 100644
--- a/man/machinectl.xml
+++ b/man/machinectl.xml
@@ -680,7 +680,8 @@
         <term><option>-l</option></term>
         <term><option>--full</option></term>
 
-        <listitem><para>Do not ellipsize process tree entries or table.</para>
+        <listitem><para>Do not ellipsize process tree entries or table. This implies
+        <option>--max-addresses=full</option>.</para>
         </listitem>
       </varlistentry>
 
diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
index 2c2b13b86f0..4b4437f91d3 100644
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -341,7 +341,7 @@ static int list_machines(int argc, char *argv[], void *userdata) {
                                 0,
                                 "",
                                 " ",
-                                arg_addrs,
+                                arg_full ? ALL_IP_ADDRESSES : arg_addrs,
                                 &addresses);
 
                 r = table_add_many(table,