picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Lennart Poettering 2012-09-03 18:54:32 -07:00
parent 1946b0bd55
commit be5412d854
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
man/systemd.conf.xml
View File

@ -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

7
src/core/main.c
View File

@ -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;

2
src/core/system.conf
View File

@ -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=