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.

diff --git a/man/systemd.conf.xml b/man/systemd.conf.xml
index 7dc5cc13ce0f598c52b378eba9a6c35e1b4f9301..a550c2c71aacc0ef86dd2ee6c64564efb9da187b 100644 (file)
--- a/man/systemd.conf.xml
+++ b/man/systemd.conf.xml
@@ -118,7 +118,7 @@
                         </varlistentry>
 
                         <varlistentry>
                         </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
 
                                 <listitem><para>Configures controllers
                                 that shall be mounted in a single

diff --git a/src/core/main.c b/src/core/main.c
index 12af3cdd270bab97d255c3a7c7ac9d188413391b..7b5c86161fe512525c5e947faf34c936b5c954d1 100644 (file)
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1305,12 +1305,13 @@ int main(int argc, char *argv[]) {
         }
 
         /* By default, mount "cpu" and "cpuacct" together */
         }
 
         /* By default, mount "cpu" and "cpuacct" together */

-        arg_join_controllers = new(char**, 2);
+        arg_join_controllers = new(char**, 3);

         if (!arg_join_controllers)
                 goto finish;
 
         if (!arg_join_controllers)
                 goto finish;
 

-        arg_join_controllers[0] = strv_new("cpu", "cpuacct", NULL);
-        arg_join_controllers[1] = NULL;
+        arg_join_controllers[0] = strv_new("cpu", "cpuacct", "cpuset", NULL);
+        arg_join_controllers[1] = strv_new("net_cls", "netprio", NULL);
+        arg_join_controllers[2] = NULL;

 
         if (!arg_join_controllers[0])
                 goto finish;
 
         if (!arg_join_controllers[0])
                 goto finish;

diff --git a/src/core/system.conf b/src/core/system.conf
index d5208186a0449d5151bf5d172a9ef62ee4fd162b..3989c2e0ce87fb2118d36213bb5afb39621fcc7a 100644 (file)
--- a/src/core/system.conf
+++ b/src/core/system.conf
@@ -20,7 +20,7 @@
 #DefaultControllers=cpu
 #DefaultStandardOutput=journal
 #DefaultStandardError=inherit
 #DefaultControllers=cpu
 #DefaultStandardOutput=journal
 #DefaultStandardError=inherit

-#JoinControllers=cpu,cpuacct
+#JoinControllers=cpu,cpuacct,cpuset net_cls,netprio

 #RuntimeWatchdogSec=0
 #ShutdownWatchdogSec=10min
 #CapabilityBoundingSet=
 #RuntimeWatchdogSec=0
 #ShutdownWatchdogSec=10min
 #CapabilityBoundingSet=