diff options
| author | Lennart Poettering <lennart@poettering.net> | 2022-07-21 11:19:13 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-08-23 09:24:44 +0200 |
| commit | 6d48c7cf736ced70c1c2fef1e1f03618911d04bc (patch) | |
| tree | 56668077e0e981085e8fe67a882b87b675f39418 /man/systemd-system.conf.xml | |
| parent | e3a4724db2fca3e0269e44dccb4c3ec692fb1943 (diff) | |
| download | systemd-6d48c7cf736ced70c1c2fef1e1f03618911d04bc.tar.gz | |
docs: remove documentation about cgroupsv1 settings
it's legacy. We'll continue to support it in code, but let's simplify
the docs a bit, and not mention this legacy stuff anymore.
Diffstat (limited to 'man/systemd-system.conf.xml')
| -rw-r--r-- | man/systemd-system.conf.xml | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml index 065bbd5a64..36f25f94e4 100644 --- a/man/systemd-system.conf.xml +++ b/man/systemd-system.conf.xml @@ -437,20 +437,22 @@ <varlistentry> <term><varname>DefaultCPUAccounting=</varname></term> - <term><varname>DefaultBlockIOAccounting=</varname></term> <term><varname>DefaultMemoryAccounting=</varname></term> <term><varname>DefaultTasksAccounting=</varname></term> <term><varname>DefaultIOAccounting=</varname></term> <term><varname>DefaultIPAccounting=</varname></term> <listitem><para>Configure the default resource accounting settings, as configured per-unit by - <varname>CPUAccounting=</varname>, <varname>BlockIOAccounting=</varname>, <varname>MemoryAccounting=</varname>, - <varname>TasksAccounting=</varname>, <varname>IOAccounting=</varname> and <varname>IPAccounting=</varname>. See + <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 if enabling CPU accounting doesn't require the CPU 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> + <varname>DefaultMemoryAccounting=</varname> to + &MEMORY_ACCOUNTING_DEFAULT;. <varname>DefaultCPUAccounting=</varname> defaults to yes if enabling CPU + accounting doesn't require the CPU 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> </varlistentry> <varlistentry> |