cgroups: don't rely on absolute path

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

diff --git a/src/lxc/cgroups/cgfsng.c b/src/lxc/cgroups/cgfsng.c
index 0d32469e70112b7969737f16c6bf0356669fead0..ddec3ad82b06cead25e04f5ce7d342a40ac2029e 100644 (file)
--- a/src/lxc/cgroups/cgfsng.c
+++ b/src/lxc/cgroups/cgfsng.c
@@ -1225,6 +1225,11 @@ __cgfsng_ops static void cgfsng_monitor_destroy(struct cgroup_ops *ops,
        }
        conf = handler->conf;
 
+       if (!ops->monitor_cgroup) {
+               WARN("Uninitialized monitor cgroup");
+               return;
+       }
+
        len = strnprintf(pidstr, sizeof(pidstr), "%d", handler->monitor_pid);
        if (len < 0)
                return;
@@ -1236,9 +1241,6 @@ __cgfsng_ops static void cgfsng_monitor_destroy(struct cgroup_ops *ops,
                bool cpuset_v1 = false;
                int ret;
 
-               if (!h->monitor_full_path)
-                       continue;
-
                /* Monitor might have died before we entered the cgroup. */
                if (handler->monitor_pid <= 0) {
                        WARN("No valid monitor process found while destroying cgroups");