- mount only cpuset subsys cgroup

- no need to parse and check fstab as this script is run after rc.sysinit
  mounts all filessystems listed there

svn-id: @12133

diff --git a/rc.d/init.d/cpusets b/rc.d/init.d/cpusets
index ccefed28ed41f80da39ee5ba09274a4d970c1559..a6b74b1969614d37f1162ccc02d8f48390f779c5 100755 (executable)
--- a/rc.d/init.d/cpusets
+++ b/rc.d/init.d/cpusets
@@ -35,17 +35,11 @@ cpuset_mount() {
        [ -n "${CGDIR}" ] && return
 
        if grep -q cgroup /proc/filesystems 2>/dev/null ; then
-               if ! grep -q "^[^#].*cgroup" /etc/fstab 2>/dev/null ; then
-                       # creating is more convenient than artificial conflict with older udev
-                       mkdir -p /dev/cgroup
-                       modprobe -s blk-cgroup 2>/dev/null
-                       # mount w/o options enables all available cgroup subsystems
-                       mount -t cgroup none /dev/cgroup
-               fi
+               # creating is more convenient than artificial conflict with older udev
+               mkdir -p /dev/cgroup
+               mount -t cgroup none /dev/cgroup -ocpuset
        elif grep -q cpuset /proc/filesystems 2>/dev/null ; then
-               if ! grep -q "^[^#].*cpuset" /etc/fstab 2>/dev/null ; then
-                       mount -t cpuset none /dev/cpuset
-               fi
+               mount -t cpuset none /dev/cpuset
        else
                nls "ERROR: CGROUP/CPUSET support not enabled in kernel" >&2
                exit 1