- if cgroup is available use all its subsystems instead of just cpusets

svn-id: @11886

diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index 95a2db53ba6b13f9b383f47cd51a654a1abd8055..4b3bdc255d4dc7f7a1fc182ca22078e0e4b02977 100755 (executable)
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -272,8 +272,9 @@ if ! is_yes "$VSERVER"; then
 
        # cpuset support
        if grep -q cgroup /proc/filesystems 2>/dev/null ; then
-               mount -n -t cgroup none /dev/cpuset -o cpuset,noprefix
-               [ $? -eq 0 ] && echo "/sbin/cpuset_release_agent" > /dev/cpuset/release_agent
+               # mount w/o options enables all available cgroup subsystems
+               modprobe -s blk-cgroup
+               mount -n -t cgroup none /dev/cgroup
        elif grep -q cpuset /proc/filesystems 2>/dev/null ; then
                mount -n -t cpuset none /dev/cpuset
        fi
@@ -515,8 +516,8 @@ if ! is_yes "$VSERVER"; then
                mount -f -t selinuxfs selinuxfs /selinux
        fi
 
-       if is_fsmounted cgroup /dev/cpuset; then
-               mount -f -t cgroup -o cpuset,noprefix none /dev/cpuset
+       if is_fsmounted cgroup /dev/cgroup; then
+               mount -f -t cgroup none /dev/cgroup
        elif is_fsmounted cpuset /dev/cpuset; then
                mount -f -t cpuset none /dev/cpuset
        fi