From: Daniel Lezcano Date: Tue, 9 Aug 2011 18:02:31 +0000 (+0200) Subject: lxc-checkconfig takes into account cgroup.clone_children X-Git-Tag: lxc-0.7.5~7 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d9e2cc0eaddd4dd0701705a42edd8f4c81fe8b43;p=thirdparty%2Flxc.git lxc-checkconfig takes into account cgroup.clone_children Take into account we may have the clone_children flag on the cgroup, so we ignore cgroup namespace in this case. Signed-off-by: Daniel Lezcano --- diff --git a/src/lxc/lxc-checkconfig.in b/src/lxc/lxc-checkconfig.in index ab27b9cd1..5dcf3a44b 100755 --- a/src/lxc/lxc-checkconfig.in +++ b/src/lxc/lxc-checkconfig.in @@ -62,8 +62,17 @@ echo -n "Network namespace: " && is_enabled CONFIG_NET_NS echo -n "Multiple /dev/pts instances: " && is_enabled DEVPTS_MULTIPLE_INSTANCES echo echo "--- Control groups ---" + +CGROUP_MNT_PATH=$(grep -m1 "^cgroup" /proc/self/mounts | awk '{ print $2 }') + echo -n "Cgroup: " && is_enabled CONFIG_CGROUPS yes -echo -n "Cgroup namespace: " && is_enabled CONFIG_CGROUP_NS + +if [ -f $CGROUP_MNT_PATH/cgroup.clone_children ]; then + echo -n "Cgroup clone_children flag: " && + $SETCOLOR_SUCCESS && echo -e "enabled" && $SETCOLOR_NORMAL +else + echo -n "Cgroup namespace: " && is_enabled CONFIG_CGROUP_NS yes +fi echo -n "Cgroup device: " && is_enabled CONFIG_CGROUP_DEVICE echo -n "Cgroup sched: " && is_enabled CONFIG_CGROUP_SCHED echo -n "Cgroup cpu account: " && is_enabled CONFIG_CGROUP_CPUACCT