summaryrefslogtreecommitdiff
path: root/man/systemd-system.conf.xml
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-09-26 22:49:44 +0200
committerLennart Poettering <lennart@poettering.net>2013-09-26 22:57:43 +0200
commit7ac807320a7416463d7ff3ef6ede574863a601c5 (patch)
tree60c9cc78d5883d35c23763743e961bca0f305212 /man/systemd-system.conf.xml
parentc68ba912c347a79885bb0e863034bdb3a8ae057e (diff)
core: drop some out-of-date references to cgroup settings
Diffstat (limited to 'man/systemd-system.conf.xml')
-rw-r--r--man/systemd-system.conf.xml27
1 files changed, 1 insertions, 26 deletions
diff --git a/man/systemd-system.conf.xml b/man/systemd-system.conf.xml
index c52e59096a..e8cf8a9cb2 100644
--- a/man/systemd-system.conf.xml
+++ b/man/systemd-system.conf.xml
@@ -104,32 +104,7 @@
</varlistentry>
<varlistentry>
- <term><varname>DefaultControllers=cpu</varname></term>
-
- <listitem><para>Configures in which
- control group hierarchies to create
- per-service cgroups automatically, in
- addition to the
- <literal>name=systemd</literal> named
- hierarchy. Defaults to
- <literal>cpu</literal>. Takes a
- space-separated list of controller
- names. Pass the empty string to ensure
- that systemd does not touch any
- hierarchies but its own.</para>
-
- <para>Note that the default value of
- 'cpu' will make realtime scheduling
- unavailable to system services. See
- <ulink
- url="http://www.freedesktop.org/wiki/Software/systemd/MyServiceCantGetRealtime">My
- Service Can't Get Realtime!</ulink>
- for more
- information.</para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><varname>JoinControllers=cpu,cpuacct,cpuset net_cls,netprio</varname></term>
+ <term><varname>JoinControllers=cpu,cpuacct net_cls,netprio</varname></term>
<listitem><para>Configures controllers
that shall be mounted in a single