SVN: rc-scripts/trunk/rc.d/init.d/cpusets

[baggins]

Author: baggins
Date: Thu Feb 10 13:12:48 2011
New Revision: 12133

Modified:
   rc-scripts/trunk/rc.d/init.d/cpusets
Log:
- 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


Modified: rc-scripts/trunk/rc.d/init.d/cpusets
==============================================================================
--- rc-scripts/trunk/rc.d/init.d/cpusets	(original)
+++ rc-scripts/trunk/rc.d/init.d/cpusets	Thu Feb 10 13:12:48 2011
@@ -35,17 +35,11 @@
 	[ -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