summaryrefslogtreecommitdiffstats
path: root/man/systemd-system.conf.xml
diff options
context:
space:
mode:
authorDaniel Mack <daniel@zonque.org>2016-11-12 13:38:38 +0100
committerLennart Poettering <lennart@poettering.net>2017-09-22 15:24:55 +0200
commit8d8631d4c9e4132d0a09b7d16996b1942e379223 (patch)
treed3a968927aab0d34f6b3dd24581b3fccba89744e /man/systemd-system.conf.xml
parentcgroup: refuse to return accounting data if accounting isn't turned on (diff)
downloadsystemd-8d8631d4c9e4132d0a09b7d16996b1942e379223.tar.xz
systemd-8d8631d4c9e4132d0a09b7d16996b1942e379223.zip
man: document the new ip accounting and filting directives
Diffstat (limited to 'man/systemd-system.conf.xml')
-rw-r--r--man/systemd-system.conf.xml15
1 files changed, 6 insertions, 9 deletions
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index 336c7a5fd1..81f1b1ef8d 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -319,17 +319,14 @@
<term><varname>DefaultBlockIOAccounting=</varname></term>
<term><varname>DefaultMemoryAccounting=</varname></term>
<term><varname>DefaultTasksAccounting=</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> and
- <varname>TasksAccounting=</varname>. See
+ <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> 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 on, the other three settings to off.</para></listitem>
+ for details on the per-unit settings. <varname>DefaultTasksAccounting=</varname> defaults to on, the other
+ four settings to off.</para></listitem>
</varlistentry>
<varlistentry>