From: Sam Morris <sam@robots.org.uk>
Date: Mon, 19 Jun 2023 11:30:43 +0000 (+0100)
Subject: Resource control manpage fixup (#28046)
X-Git-Tag: v254-rc1~175
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9714fe4056731770112d4fbebe9b930d4ed7418;p=thirdparty%2Fsystemd.git

Resource control manpage fixup (#28046)

The order of the description of each item should match the order that they are declared. Un-document effect of deprecated non-unified CGroup hierarchy on
DefaultCPUAccounting=. Mention that the default value for DefaultCPUAccouting= is
affected by the kernel version.
---

diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index 4860dab8417..e106dabaf4a 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -438,17 +438,19 @@
         <term><varname>DefaultIOAccounting=</varname></term>
         <term><varname>DefaultIPAccounting=</varname></term>
 
-        <listitem><para>Configure the default resource accounting settings, as configured per-unit by
+        <listitem>
+        <para>Configure the default resource accounting settings, as configured per-unit by
         <varname>CPUAccounting=</varname>, <varname>MemoryAccounting=</varname>,
         <varname>TasksAccounting=</varname>, <varname>IOAccounting=</varname> and
         <varname>IPAccounting=</varname>. See
         <citerefentry><refentrytitle>systemd.resource-control</refentrytitle><manvolnum>5</manvolnum></citerefentry>
-        for details on the per-unit settings. <varname>DefaultTasksAccounting=</varname> defaults to yes,
-        <varname>DefaultMemoryAccounting=</varname> to &MEMORY_ACCOUNTING_DEFAULT;.
-        <varname>DefaultCPUAccounting=</varname> defaults to yes, but really has no effect if enabling CPU
-        accounting doesn't require the <option>cpu</option> controller to be enabled (Linux 4.15+ using the
-        unified hierarchy for resource control), otherwise it defaults to no. The other three settings
-        default to no.</para></listitem>
+        for details on the per-unit settings.</para>
+
+        <para><varname>DefaultCPUAccounting=</varname> defaults to yes when running on kernel ≥4.15, and no on older versions.
+        <varname>DefaultMemoryAccounting=</varname> defaults to &MEMORY_ACCOUNTING_DEFAULT;.
+        <varname>DefaultTasksAccounting=</varname> defaults to yes.
+        The other settings default to no.</para>
+        </listitem>
       </varlistentry>
 
       <varlistentry>