From: Christian Brauner Date: Mon, 10 Sep 2018 13:42:51 +0000 (+0200) Subject: cgroups: add monitor_cgroup member X-Git-Tag: lxc-3.1.0~98^2~7 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d39e9d8b046477e1f0ae0ed9a693bb075ece5950;p=thirdparty%2Flxc.git cgroups: add monitor_cgroup member Signed-off-by: Christian Brauner --- diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c index 835a881c1..17d0740d1 100644 --- a/src/lxc/cgroups/cgfsng.c +++ b/src/lxc/cgroups/cgfsng.c @@ -2569,6 +2569,7 @@ __cgfsng_ops__ static bool cgfsng_data_init(struct cgroup_ops *ops) return false; } ops->cgroup_pattern = must_copy_string(cgroup_pattern); + ops->monitor_pattern = must_copy_string("lxc.monitor"); return true; } diff --git a/src/lxc/cgroups/cgroup.c b/src/lxc/cgroups/cgroup.c index 517bb4b3c..de602d04e 100644 --- a/src/lxc/cgroups/cgroup.c +++ b/src/lxc/cgroups/cgroup.c @@ -76,6 +76,7 @@ void cgroup_exit(struct cgroup_ops *ops) free(ops->cgroup_pattern); free(ops->container_cgroup); + free(ops->monitor_pattern); for (it = ops->hierarchies; it && *it; it++) { char **ctrlr; diff --git a/src/lxc/cgroups/cgroup.h b/src/lxc/cgroups/cgroup.h index 9aba1842b..d79508362 100644 --- a/src/lxc/cgroups/cgroup.h +++ b/src/lxc/cgroups/cgroup.h @@ -92,6 +92,7 @@ struct cgroup_ops { char **cgroup_use; char *cgroup_pattern; char *container_cgroup; + char *monitor_pattern; /* @hierarchies * - A NULL-terminated array of struct hierarchy, one per legacy