From: Daniel Hokka Zakrisson <daniel@hozac.com>
Date: Sat, 18 Feb 2012 16:37:27 +0000 (+0100)
Subject: Revert "assume that /sys/fs/cgroup is always per_ss=1"
X-Git-Url: http://git.linux-vserver.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d641b1e3fac4d105ac0c7d0739d4cff765387264;p=util-vserver.git

Revert "assume that /sys/fs/cgroup is always per_ss=1"

This reverts commit b86560b87e73f011c96a303dcaca640eea1f2551.
---

diff --git a/scripts/vserver.functions b/scripts/vserver.functions
index 95ada0d..808fcd1 100644
--- a/scripts/vserver.functions
+++ b/scripts/vserver.functions
@@ -1491,7 +1491,7 @@ function _generateCgroupOptions
     findFile file "$__CONFDIR/.defaults/cgroup/mnt" ""
     if test -n "$file"; then
 	read CGROUP_MNT < "$file"
-    elif test -d /sys/fs/cgroup; then
+    elif test -d /sys/fs/cgroup -a -d /sys/fs/cgroup/"${CGROUP_SUBSYS[0]}"; then
 	CGROUP_MNT=/sys/fs/cgroup
 	CGROUP_MNT_PER_SS=1
     fi