summaryrefslogtreecommitdiff
path: root/man/systemd.unit.xml
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2022-08-24 17:00:53 +0200
committerGitHub <noreply@github.com>2022-08-24 17:00:53 +0200
commit771fe73c75781f52200ffdd30efef9fd870b7476 (patch)
tree8704fa732ec7fac8bb2b512eaf5a072e80a94f10 /man/systemd.unit.xml
parent98f3e84342dbb9da48ffa22bfdf122bdae4da1c6 (diff)
parentaf9d5d507aae7e037739139931350ea5573fdeff (diff)
downloadsystemd-771fe73c75781f52200ffdd30efef9fd870b7476.tar.gz
Merge pull request #24072 from poettering/remove-cgroupsv1-docs
decgroupsv1ification: first steps – remove from docs, and generate warnings
Diffstat (limited to 'man/systemd.unit.xml')
-rw-r--r--man/systemd.unit.xml21
1 files changed, 5 insertions, 16 deletions
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 7e744471c3..767c7186cd 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -1576,25 +1576,14 @@
<term><varname>ConditionControlGroupController=</varname></term>
<listitem><para>Check whether given cgroup controllers (e.g. <literal>cpu</literal>) are available
- for use on the system or whether the legacy v1 cgroup or the modern v2 cgroup hierarchy is used.
- </para>
+ for use on the system.</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>cpuacct</literal>,
- <literal>io</literal>, <literal>blkio</literal>, <literal>memory</literal>,
- <literal>devices</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 (see the discussion of <varname>systemd.unified_cgroup_hierarchy</varname> and
- <varname>systemd.legacy_systemd_cgroup_controller</varname> in
- <citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>
- for more information).</para>
- </listitem>
+ 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>
</varlistentry>
<varlistentry>