SVN: rc-scripts/trunk/rc.d/rc.sysinit

[baggins]

Author: baggins
Date: Sat Nov  6 01:07:07 2010
New Revision: 11885

Modified:
   rc-scripts/trunk/rc.d/rc.sysinit
Log:
- commit at rev 10523 was completely bogus, preventing mounting cpuset at all,
  as default fstab contains cpuset line with noauto option


Modified: rc-scripts/trunk/rc.d/rc.sysinit
==============================================================================
--- rc-scripts/trunk/rc.d/rc.sysinit	(original)
+++ rc-scripts/trunk/rc.d/rc.sysinit	Sat Nov  6 01:07:07 2010
@@ -270,16 +270,12 @@
 		/sbin/blogd
 	fi
 
-	# cpuset support (mount if not found in fstab - should be ^# excluded?)
+	# cpuset support
 	if grep -q cgroup /proc/filesystems 2>/dev/null ; then
-		if ! grep -q cgroup /etc/fstab 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
-		fi
+		mount -n -t cgroup none /dev/cpuset -o cpuset,noprefix
+		[ $? -eq 0 ] && echo "/sbin/cpuset_release_agent" > /dev/cpuset/release_agent
 	elif grep -q cpuset /proc/filesystems 2>/dev/null ; then
-		if ! grep -q cpuset /etc/fstab 2>/dev/null ; then
-			mount -n -t cpuset none /dev/cpuset
-		fi
+		mount -n -t cpuset none /dev/cpuset
 	fi
 
 	# Configure Linux kernel (initial configuration, some required modules still