From 254d11379d2152154972d27e17fdde1d686c2c5e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Sat, 6 Nov 2010 00:11:29 +0000 Subject: [PATCH] - if cgroup is available use all its subsystems instead of just cpusets svn-id: @11886 --- rc.d/rc.sysinit | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index 95a2db53..4b3bdc25 100755 --- 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 -- 2.44.0