From: Serge Hallyn <serge.hallyn@ubuntu.com>
Date: Sun, 31 Jan 2016 15:34:54 +0000 (+0100)
Subject: cgfs: prune the init scope from paths
X-Git-Tag: lxc-2.0.0.beta2~8^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F785%2Fhead;p=thirdparty%2Flxc.git

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 963216956..b43e1ce01 100644
--- a/src/lxc/cgfs.c
+++ b/src/lxc/cgfs.c
@@ -1662,6 +1662,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;