diff options
| author | Lennart Poettering <lennart@poettering.net> | 2012-09-03 18:54:32 -0700 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2012-09-03 18:59:05 -0700 |
| commit | be5412d85493615bc2b027bd7131497e31725190 (patch) | |
| tree | ee1c6cbd00c4092009b70611053eff51f4f642f1 | |
| parent | 1946b0bd55b356ea25bd747cb338a4b31fabeecf (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.
| -rw-r--r-- | man/systemd.conf.xml | 2 | ||||
| -rw-r--r-- | src/core/main.c | 7 | ||||
| -rw-r--r-- | src/core/system.conf | 2 |
3 files changed, 6 insertions, 5 deletions
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 diff --git a/src/core/main.c b/src/core/main.c index 12af3cdd27..7b5c86161f 100644 --- 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 */ - arg_join_controllers = new(char**, 2); + arg_join_controllers = new(char**, 3); 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; diff --git a/src/core/system.conf b/src/core/system.conf index d5208186a0..3989c2e0ce 100644 --- a/src/core/system.conf +++ b/src/core/system.conf @@ -20,7 +20,7 @@ #DefaultControllers=cpu #DefaultStandardOutput=journal #DefaultStandardError=inherit -#JoinControllers=cpu,cpuacct +#JoinControllers=cpu,cpuacct,cpuset net_cls,netprio #RuntimeWatchdogSec=0 #ShutdownWatchdogSec=10min #CapabilityBoundingSet= |