summaryrefslogtreecommitdiff
path: root/man/systemd.conf.xml
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2012-09-03 18:54:32 -0700
committerLennart Poettering <lennart@poettering.net>2012-09-03 18:59:05 -0700
commitbe5412d85493615bc2b027bd7131497e31725190 (patch)
treeee1c6cbd00c4092009b70611053eff51f4f642f1 /man/systemd.conf.xml
parent1946b0bd55b356ea25bd747cb338a4b31fabeecf (diff)
main: jointly mount more controllers
After talking to the cgroup kernel folks at LPC we came to the conclusion that it is probably a good idea to mount all CPU related resp. all network related cgroup controllers together, both because they are good defaults for admins and because this might prepare for eventual kernel cleanups where the ability to mount them separately is removed.
Diffstat (limited to 'man/systemd.conf.xml')
-rw-r--r--man/systemd.conf.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/man/systemd.conf.xml b/man/systemd.conf.xml
index 7dc5cc13c..a550c2c71 100644
--- a/man/systemd.conf.xml
+++ b/man/systemd.conf.xml
@@ -118,7 +118,7 @@
</varlistentry>
<varlistentry>
- <term><varname>JoinControllers=cpu,cpuacct</varname></term>
+ <term><varname>JoinControllers=cpu,cpuacct,cpuset net_cls,netprio</varname></term>
<listitem><para>Configures controllers
that shall be mounted in a single