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

[arekm]

Author: arekm
Date: Wed Dec 22 06:54:57 2010
New Revision: 12019

Modified:
   rc-scripts/trunk/rc.d/rc.sysinit
Log:
cgroup/cpuset can exist in fstab but be commented out. Handle that.

Modified: rc-scripts/trunk/rc.d/rc.sysinit
==============================================================================
--- rc-scripts/trunk/rc.d/rc.sysinit	(original)
+++ rc-scripts/trunk/rc.d/rc.sysinit	Wed Dec 22 06:54:57 2010
@@ -272,7 +272,7 @@
 
 	# cgroup/cpuset support
 	if grep -q cgroup /proc/filesystems 2>/dev/null ; then
-		if ! grep -q cgroup /etc/fstab 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
 			# mount w/o options enables all available cgroup subsystems
@@ -280,7 +280,7 @@
 			mount -n -t cgroup none /dev/cgroup
 		fi
 	elif grep -q cpuset /proc/filesystems 2>/dev/null ; then
-		if ! grep -q cpuset /etc/fstab 2>/dev/null ; then
+		if ! grep -q "^[^#].*cpuset" /etc/fstab 2>/dev/null ; then
 			mount -n -t cpuset none /dev/cpuset
 		fi
 	fi