diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2023-03-31 18:51:17 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2023-04-01 16:37:23 +0200 |
| commit | c32f496b9e7326584e49ae478539c4bc5c51ebe1 (patch) | |
| tree | e2d829e000cd619d03ffdabd2bb373c71c55449a /man | |
| parent | 2a4efebb3ba762468937dd45d0b1cb51a5122fde (diff) | |
| download | systemd-c32f496b9e7326584e49ae478539c4bc5c51ebe1.tar.gz | |
man: restore description of ConditionControlGroupController=v1|v2
We use ConditionControlGroupController=v2 in systemd-oomd.service, and also
this condition makes sense in general, so it should be documented.
This reverts a part of 6d48c7cf736ced70c1c2fef1e1f03618911d04bc.
Deprecated commandline options and v1 controller names were removed from
the description.
Diffstat (limited to 'man')
| -rw-r--r-- | man/systemd.unit.xml | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml index 9411ea2e03..c618e403f7 100644 --- a/man/systemd.unit.xml +++ b/man/systemd.unit.xml @@ -1602,14 +1602,23 @@ <term><varname>ConditionControlGroupController=</varname></term> <listitem><para>Check whether given cgroup controllers (e.g. <literal>cpu</literal>) are available - for use on the system.</para> + for use on the system or whether the legacy v1 cgroup or the modern v2 cgroup hierarchy is used. + </para> <para>Multiple controllers may be passed with a space separating them; in this case the condition will only pass if all listed controllers are available for use. Controllers unknown to systemd are - ignored. Valid controllers are <literal>cpu</literal>, <literal>cpuset</literal>, - <literal>io</literal>, <literal>memory</literal>, and <literal>pids</literal>. Even if available in - the kernel, a particular controller may not be available if it was disabled on the kernel command - line with <varname>cgroup_disable=controller</varname>.</para></listitem> + ignored. Valid controllers are <literal>cpu</literal>, <literal>io</literal>, + <literal>memory</literal>, and <literal>pids</literal>. Even if available in the kernel, a + particular controller may not be available if it was disabled on the kernel command line with + <varname>cgroup_disable=controller</varname>.</para> + + <para>Alternatively, two special strings <literal>v1</literal> and <literal>v2</literal> may be + specified (without any controller names). <literal>v2</literal> will pass if the unified v2 cgroup + hierarchy is used, and <literal>v1</literal> will pass if the legacy v1 hierarchy or the hybrid + hierarchy are used. Note that legacy or hybrid hierarchies have been deprecated. See + <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry> for + more information.</para> + </listitem> </varlistentry> <varlistentry> |