From be5412d85493615bc2b027bd7131497e31725190 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 3 Sep 2012 18:54:32 -0700
Subject: 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.
---
 man/systemd.conf.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'man')

diff --git a/man/systemd.conf.xml b/man/systemd.conf.xml
index 7dc5cc13ce..a550c2c71a 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
-- 
cgit v1.2.3-54-g00ecf