From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 5 Jun 2023 16:40:26 +0000 (+0200)
Subject: cgls/cgtop: spell field/column "CGroup" rather than "Control Group"
X-Git-Tag: v254-rc1~280
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=06390e22c92c626545ec4841c1dfdd25632efa08;p=thirdparty%2Fsystemd.git

cgls/cgtop: spell field/column "CGroup" rather than "Control Group"

In the documentation we usually spell the concept "control group".
Internally in code we usually call it "cgroup" or "CGroup". In systemctl output we
called the field "CGroup" so far, i.e. a capitalized version of the
internal name. This is of course very unsystematic. Let's clean this up
a bit: let's now say:

* in docs, continue to spell it out "control groups"
* in brief output call it "CGroup"
* internally call it "cgroup" or "CGroup"

Fixes: #14429
---

diff --git a/src/cgls/cgls.c b/src/cgls/cgls.c
index a34b0aa604b..70fa2602469 100644
--- a/src/cgls/cgls.c
+++ b/src/cgls/cgls.c
@@ -185,7 +185,7 @@ static void show_cg_info(const char *controller, const char *path) {
         if (cg_all_unified() == 0 && controller && !streq(controller, SYSTEMD_CGROUP_CONTROLLER))
                 printf("Controller %s; ", controller);
 
-        printf("Control group %s:\n", empty_to_root(path));
+        printf("CGroup %s:\n", empty_to_root(path));
         fflush(stdout);
 }
 
diff --git a/src/cgtop/cgtop.c b/src/cgtop/cgtop.c
index bb4f7a5ef09..987643f6617 100644
--- a/src/cgtop/cgtop.c
+++ b/src/cgtop/cgtop.c
@@ -647,7 +647,7 @@ static void display(Hashmap *a) {
 
                 printf("%s%s%-*s%s %s%7s%s %s%*s%s %s%8s%s %s%8s%s %s%8s%s%s\n",
                        ansi_underline(),
-                       arg_order == ORDER_PATH ? on : "", path_columns, "Control Group",
+                       arg_order == ORDER_PATH ? on : "", path_columns, "CGroup",
                        arg_order == ORDER_PATH ? off : "",
                        arg_order == ORDER_TASKS ? on : "",
                        arg_count == COUNT_PIDS ? "Tasks" : arg_count == COUNT_USERSPACE_PROCESSES ? "Procs" : "Proc+",