diff options
author | Daniel Mack <github@zonque.org> | 2015-09-10 19:11:29 +0200 |
---|---|---|
committer | Daniel Mack <github@zonque.org> | 2015-09-10 19:11:29 +0200 |
commit | a18f3caa5613196700062e5f4cf55f36a3f76f2c (patch) | |
tree | 248315bbd774c6111b5e1c10ba52e6ba5e0c499b /src/core/main.c | |
parent | 786c5bf957f8f7b78c7a0999908ff822e712b53e (diff) | |
parent | 03a7b521e3ffb7f5d153d90480ba5d4bc29d1e8f (diff) |
Merge pull request #1239 from poettering/cgroup-pids
core: add support for the "pids" cgroup controller
Diffstat (limited to 'src/core/main.c')
-rw-r--r-- | src/core/main.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/main.c b/src/core/main.c index c9657505c3..200fe740da 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -114,6 +114,7 @@ static FILE* arg_serialization = NULL; static bool arg_default_cpu_accounting = false; static bool arg_default_blockio_accounting = false; static bool arg_default_memory_accounting = false; +static bool arg_default_tasks_accounting = false; static void nop_handler(int sig) {} @@ -676,6 +677,7 @@ static int parse_config_file(void) { { "Manager", "DefaultCPUAccounting", config_parse_bool, 0, &arg_default_cpu_accounting }, { "Manager", "DefaultBlockIOAccounting", config_parse_bool, 0, &arg_default_blockio_accounting }, { "Manager", "DefaultMemoryAccounting", config_parse_bool, 0, &arg_default_memory_accounting }, + { "Manager", "DefaultTasksAccounting", config_parse_bool, 0, &arg_default_tasks_accounting }, {} }; @@ -704,6 +706,7 @@ static void manager_set_defaults(Manager *m) { m->default_cpu_accounting = arg_default_cpu_accounting; m->default_blockio_accounting = arg_default_blockio_accounting; m->default_memory_accounting = arg_default_memory_accounting; + m->default_tasks_accounting = arg_default_tasks_accounting; manager_set_default_rlimits(m, arg_default_rlimit); manager_environment_add(m, NULL, arg_default_environment); |