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

[baggins]

Author: baggins
Date: Mon Jan  5 20:08:00 2009
New Revision: 10050

Modified:
   rc-scripts/trunk/rc.d/init.d/cpusets
   rc-scripts/trunk/rc.d/rc.sysinit
Log:
- use noprefix mount option for cgroup cpuset


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	Mon Jan  5 20:08:00 2009
@@ -29,18 +29,15 @@
 fi
 
 cpuset_create() {
-	local cgroup CPUS MEMS CPU_EXCLUSIVE MEM_EXCLUSIVE NOTIFY_ON_RELEASE TASKS
+	local CPUS MEMS CPU_EXCLUSIVE MEM_EXCLUSIVE NOTIFY_ON_RELEASE TASKS
 
 	. /etc/sysconfig/cpusets/cpuset-$i
 
 	if mkdir /dev/cpuset/"$NAME" >/dev/null 2>&1 ; then
-		cgroup=
-		[ -e /dev/cpuset/cpuset.cpus ] && cgroup="cpuset."
-
-		[ -n "$CPUS" ] && echo "$CPUS" >/dev/cpuset/"$NAME"/${cgroup}cpus
-		[ -n "$MEMS" ] && echo "$MEMS" >/dev/cpuset/"$NAME"/${cgroup}mems
-		[ -n "$CPU_EXCLUSIVE" ] && echo "$CPU_EXCLUSIVE" >/dev/cpuset/"$NAME"/${cgroup}cpu_exclusive
-		[ -n "$MEM_EXCLUSIVE" ] && echo "$MEM_EXCLUSIVE" >/dev/cpuset/"$NAME"/${cgroup}mem_exclusive
+		[ -n "$CPUS" ] && echo "$CPUS" >/dev/cpuset/"$NAME"/cpus
+		[ -n "$MEMS" ] && echo "$MEMS" >/dev/cpuset/"$NAME"/mems
+		[ -n "$CPU_EXCLUSIVE" ] && echo "$CPU_EXCLUSIVE" >/dev/cpuset/"$NAME"/cpu_exclusive
+		[ -n "$MEM_EXCLUSIVE" ] && echo "$MEM_EXCLUSIVE" >/dev/cpuset/"$NAME"/mem_exclusive
 		[ -n "$VIRTUALIZE" ] && echo "$VIRTUALIZE" >/dev/cpuset/"$NAME"/virtualize
 		[ -n "$NOTIFY_ON_RELEASE" ] && echo "$NOTIFY_ON_RELEASE" >/dev/cpuset/"$NAME"/notify_on_release
 		[ -n "$TASKS" ] && echo "$TASKS" >/dev/cpuset/"$NAME"/tasks

Modified: rc-scripts/trunk/rc.d/rc.sysinit
==============================================================================
--- rc-scripts/trunk/rc.d/rc.sysinit	(original)
+++ rc-scripts/trunk/rc.d/rc.sysinit	Mon Jan  5 20:08:00 2009
@@ -221,7 +221,7 @@
 
 	# cpuset support (mounted unconditionally, shouldn't be a problem)
 	if grep -q cgroup /proc/filesystems 2>/dev/null ; then
-		mount -n -t cgroup none /dev/cpuset -ocpuset
+		mount -n -t cgroup none /dev/cpuset -ocpuset,noprefix
 		[ $? -eq 0 ] && echo "/sbin/cpuset_release_agent" > /dev/cpuset/release_agent
 	elif grep -q cpuset /proc/filesystems 2>/dev/null ; then
 		mount -n -t cpuset none /dev/cpuset