From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Tue, 14 Mar 2023 16:51:24 +0000 (+0100)
Subject: cgls: stop showing cgroup ids and xattrs by default
X-Git-Tag: v254-rc1~1025^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5346bb499f77650679f9d44885ea5551b4bcce81;p=thirdparty%2Fsystemd.git

cgls: stop showing cgroup ids and xattrs by default

Those are rather specialized bits of information, useful mostly for debugging.
I use cgls quite often but never had the need to use either of those…
But they take up a significant amount of screen real estate, esp. when
executed as root:

-.slice
├─user.slice (#1683)
│ → user.invocation_id: 74b0bd1258c5485eb969016384e0d06a
│ → trusted.invocation_id: 74b0bd1258c5485eb969016384e0d06a
│ └─user-1000.slice (#6488)
│   → user.invocation_id: b0261a14fe74490d9a9d5266c52cceb6
│   → trusted.invocation_id: b0261a14fe74490d9a9d5266c52cceb6
│   ├─user@1000.service … (#6590)
│   │ → user.invocation_id: 9e1fb54ad07940d8b92c33c81d169f11
│   │ → user.delegate: 1
│   │ → trusted.invocation_id: 9e1fb54ad07940d8b92c33c81d169f11
│   │ → trusted.delegate: 1
│   │ ├─session.slice (#6874)
...

Let's not show them by default, so we can show more cgroups.

(Also, on a terminal, we already highlight delegate units via underlining and
an ellipsis, so 'user.delegate:1' is redundant.)
---

diff --git a/man/systemd-cgls.xml b/man/systemd-cgls.xml
index 3fa0a35770e..4b5449e71cf 100644
--- a/man/systemd-cgls.xml
+++ b/man/systemd-cgls.xml
@@ -109,14 +109,14 @@
         <term><option>--xattr=</option></term>
 
         <listitem><para>Controls whether to include information about extended attributes of the listed
-        control groups in the output. Expects a boolean value, defaults to yes.</para></listitem>
+        control groups in the output. Expects a boolean value. Defaults to no.</para></listitem>
       </varlistentry>
 
       <varlistentry>
         <term><option>--cgroup-id=</option></term>
 
         <listitem><para>Controls whether to include the numeric ID of the listed control groups in the
-        output. Expects a boolean value, defaults to yes.</para></listitem>
+        output. Expects a boolean value. Defaults to no.</para></listitem>
       </varlistentry>
 
       <xi:include href="standard-options.xml" xpointer="help" />
diff --git a/src/cgls/cgls.c b/src/cgls/cgls.c
index d6703634e11..a0c0d291169 100644
--- a/src/cgls/cgls.c
+++ b/src/cgls/cgls.c
@@ -24,7 +24,7 @@
 #include "unit-name.h"
 
 static PagerFlags arg_pager_flags = 0;
-static OutputFlags arg_output_flags = OUTPUT_CGROUP_XATTRS | OUTPUT_CGROUP_ID;
+static OutputFlags arg_output_flags = 0;
 
 static enum {
         SHOW_UNIT_NONE,