From: Serge Hallyn Date: Fri, 26 Feb 2016 21:35:24 +0000 (-0800) Subject: cgfs: ignore mount prefix in mountinfo if cgroup namespaces are supported X-Git-Tag: lxc-2.0.0.rc4~1^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F856%2Fhead;p=thirdparty%2Flxc.git cgfs: ignore mount prefix in mountinfo if cgroup namespaces are supported This is not 100% correct, but will suffice until we fix the kernel so that we can distinguish between bind mounts and namespaced cgroupfs mounts. Signed-off-by: Serge Hallyn --- diff --git a/src/lxc/cgfs.c b/src/lxc/cgfs.c index 8c1cb64ea..16c80ebe3 100644 --- a/src/lxc/cgfs.c +++ b/src/lxc/cgfs.c @@ -418,6 +418,7 @@ static bool find_hierarchy_mountpts( struct cgroup_meta_data *meta_data, char ** size_t mount_point_capacity = 0; size_t token_capacity = 0; int r; + bool is_cgns = cgns_supported(); proc_self_mountinfo = fopen_cloexec("/proc/self/mountinfo", "r"); /* if for some reason (because of setns() and pid namespace for example), @@ -512,7 +513,7 @@ static bool find_hierarchy_mountpts( struct cgroup_meta_data *meta_data, char ** meta_data->mount_points[mount_point_count++] = mount_point; mount_point->hierarchy = h; - if (is_lxcfs) + if (is_lxcfs || is_cgns) mount_point->mount_prefix = strdup("/"); else mount_point->mount_prefix = strdup(tokens[3]);