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

[baggins]

Author: baggins
Date: Fri Nov 26 00:54:57 2010
New Revision: 11913

Modified:
   rc-scripts/trunk/rc.d/rc.sysinit
Log:
- don't mount cgroup if it's set up in fstab
  http://lists.pld-linux.org/mailman/pipermail/pld-devel-pl/2010-November/152970.html
  BTW, all this kinda sucks and needs revamp :(


Modified: rc-scripts/trunk/rc.d/rc.sysinit
==============================================================================
--- rc-scripts/trunk/rc.d/rc.sysinit	(original)
+++ rc-scripts/trunk/rc.d/rc.sysinit	Fri Nov 26 00:54:57 2010
@@ -272,13 +272,17 @@
 
 	# cgroup/cpuset support
 	if grep -q cgroup /proc/filesystems 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
-		modprobe -s blk-cgroup 2> /dev/null
-		mount -n -t cgroup none /dev/cgroup
+		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
+			modprobe -s blk-cgroup 2> /dev/null
+			mount -n -t cgroup none /dev/cgroup
+		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