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

[blues]

Author: blues
Date: Tue Sep  1 20:59:26 2009
New Revision: 10523

Modified:
   rc-scripts/trunk/rc.d/rc.sysinit
Log:
- cpuset shouldn't be mounted unconditionally - it has few options


Modified: rc-scripts/trunk/rc.d/rc.sysinit
==============================================================================
--- rc-scripts/trunk/rc.d/rc.sysinit	(original)
+++ rc-scripts/trunk/rc.d/rc.sysinit	Tue Sep  1 20:59:26 2009
@@ -224,12 +224,16 @@
 		/sbin/blogd
 	fi
 
-	# cpuset support (mounted unconditionally, shouldn't be a problem)
+	# cpuset support (mount if not found in fstab - should be ^# excluded?)
 	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
+		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
 	elif grep -q cpuset /proc/filesystems 2>/dev/null ; then
-		mount -n -t cpuset none /dev/cpuset
+		if ! grep -q cpuset /etc/fstab 2>/dev/null ; then
+			mount -n -t cpuset none /dev/cpuset
+		fi
 	fi
 
 	# Configure Linux kernel (initial configuration, some required modules still