From a3093bf7ba9e93056bd6aabb30ed0d20210c345c Mon Sep 17 00:00:00 2001 From: Daniel Hokka Zakrisson Date: Thu, 25 Feb 2010 22:37:52 +0000 Subject: [PATCH] Don't mount the ns subsystem. git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@2882 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- scripts/vserver.functions | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/vserver.functions b/scripts/vserver.functions index ed487fa..b014abf 100644 --- a/scripts/vserver.functions +++ b/scripts/vserver.functions @@ -1443,6 +1443,10 @@ function _generateCgroupOptions findFile file "$__CONFDIR/.defaults/cgroup/subsys" "" if test -n "$file"; then read CGROUP_SUBSYS < "$file" + elif $_GREP -q '^ns[[:space:]]' /proc/cgroups; then + # Hack for the ns subsystem, with which we are incompatible + CGROUP_SUBSYS=$($_SED '/^#/d;/^ns[[:space:]]/d;s/[[:space:]].*//' /proc/cgroups | \ + (s=""; while read x; do test -n "$s" && s="$s,"; s="$s$x"; done; echo "$s")) fi findFile file "$__CONFDIR/.defaults/cgroup/inherit" "" if test -n "$file"; then -- 1.8.1.5