Unverified Commit 9ea09fb4 by Marcos Paulo de Souza Committed by Christian Brauner

cgroups: add check for lxc.cgroup.use

Closes #870. Signed-off-by: 's avatarMarcos Paulo de Souza <marcos.souza.org@gmail.com>
parent ff5976cd
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include "cgroup.h" #include "cgroup.h"
#include "conf.h" #include "conf.h"
#include "initutils.h"
#include "log.h" #include "log.h"
#include "start.h" #include "start.h"
...@@ -246,9 +247,14 @@ void prune_init_scope(char *cg) ...@@ -246,9 +247,14 @@ void prune_init_scope(char *cg)
* is not mounted then it will be ignored. But if systemd is mounted, then it * is not mounted then it will be ignored. But if systemd is mounted, then it
* must be setup so that lxc can create cgroups in it, else containers will * must be setup so that lxc can create cgroups in it, else containers will
* fail. * fail.
*
* cgroups listed in lxc.cgroup.use are also treated as crucial
*
*/ */
bool is_crucial_cgroup_subsystem(const char *s) bool is_crucial_cgroup_subsystem(const char *s)
{ {
const char *cgroup_use;
if (strcmp(s, "systemd") == 0) if (strcmp(s, "systemd") == 0)
return true; return true;
...@@ -258,5 +264,9 @@ bool is_crucial_cgroup_subsystem(const char *s) ...@@ -258,5 +264,9 @@ bool is_crucial_cgroup_subsystem(const char *s)
if (strcmp(s, "freezer") == 0) if (strcmp(s, "freezer") == 0)
return true; return true;
cgroup_use = lxc_global_config_value("lxc.cgroup.use");
if (cgroup_use && strstr(cgroup_use, s))
return true;
return false; return false;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment