diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-02-15 11:43:08 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2018-02-15 12:02:41 +0100 |
| commit | 444d5863334e3f6a4b415ae72d815dead4f73444 (patch) | |
| tree | 5404905814c57251e3def191242e0867c9ce44a5 /man | |
| parent | pid1: turn memory accounting on by default now (diff) | |
| download | systemd-444d5863334e3f6a4b415ae72d815dead4f73444.tar.xz systemd-444d5863334e3f6a4b415ae72d815dead4f73444.zip | |
meson: add -Dmemory-accounting-default=true|false
This makes it easy to set the default for distributions and users which want to
default to off because they primarily use older kernels.
Diffstat (limited to 'man')
| -rw-r--r-- | man/custom-entities.ent.in | 1 | ||||
| -rw-r--r-- | man/systemd-system.conf.xml | 10 |
2 files changed, 8 insertions, 3 deletions
diff --git a/man/custom-entities.ent.in b/man/custom-entities.ent.in index 9ea92384aa..a1dbf7133f 100644 --- a/man/custom-entities.ent.in +++ b/man/custom-entities.ent.in @@ -6,3 +6,4 @@ <!ENTITY systemenvgeneratordir @SYSTEM_ENV_GENERATOR_PATH@> <!ENTITY userenvgeneratordir @USER_ENV_GENERATOR_PATH@> <!ENTITY CERTIFICATE_ROOT @CERTIFICATE_ROOT@> +<!ENTITY MEMORY_ACCOUNTING_DEFAULT @MEMORY_ACCOUNTING_DEFAULT_ON_OFF@> diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml index d875a3c46f..fca9690092 100644 --- a/man/systemd-system.conf.xml +++ b/man/systemd-system.conf.xml @@ -1,6 +1,9 @@ <?xml version='1.0'?> <!--*- Mode: nxml; nxml-child-indent: 2; indent-tabs-mode: nil -*--> <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" - "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" [ +<!ENTITY % entities SYSTEM "custom-entities.ent" > +%entities; +]> <!-- SPDX-License-Identifier: LGPL-2.1+ @@ -338,8 +341,9 @@ <varname>CPUAccounting=</varname>, <varname>BlockIOAccounting=</varname>, <varname>MemoryAccounting=</varname>, <varname>TasksAccounting=</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> and - <varname>DefaultMemoryAccounting=</varname> default to on, the other three settings to off.</para></listitem> + for details on the per-unit settings. <varname>DefaultTasksAccounting=</varname> defaults to on, + <varname>DefaultMemoryAccounting=</varname> to &MEMORY_ACCOUNTING_DEFAULT;, + the other three settings to off.</para></listitem> </varlistentry> <varlistentry> |