cgfs: prune the init scope from paths

Just as cgmanager does, if we are calculating a task's paths, drop
the trailing '/init.scope'.  We don't want the container to sit under
there.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>

diff --git a/src/lxc/cgfs.c b/src/lxc/cgfs.c
index 1c7cb98219d5adb2452c37cec1e6848059ac0f0b..9caa40bf68ddad414d30e352c9fe4e5b8b1ca7d2 100644 (file)
--- a/src/lxc/cgfs.c
+++ b/src/lxc/cgfs.c
@@ -1661,6 +1661,7 @@ lxc_cgroup_process_info_getx(const char *proc_pid_cgroup_str,
                entry->cgroup_path = strdup(colon2);
                if (!entry->cgroup_path)
                        goto out_error;
+               prune_init_scope(entry->cgroup_path);
 
                *cptr = entry;
                cptr = &entry->next;