cgroups: add monitor_cgroup member

Signed-off-by: Christian Brauner <christian.brauner@ubuntu.com>

diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c
index 835a881c1670abd141b23b0a03aac75e7e820ca6..17d0740d124f67eab37894e04a7e37321539b0a9 100644 (file)
--- 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 517bb4b3cc610a631f173ce7fe1d25b58cad6153..de602d04ee623f53a00fa6d79040af648e2fc4e3 100644 (file)
--- 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 9aba1842b99d6419cee56e3c3e3366c3a2da9a29..d7950836281165f8d67a4005f8a454b1dccfa892 100644 (file)
--- 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