[gentoo-commits] proj/openrc:master commit in: init.d/, etc/

["William Hubbs" <williamh@gentoo.org>]

commit:     3df0bd64cb8d520cb4e65b1ac307d0b9fa4e83c3
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Jul  3 18:49:58 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Jul  3 18:49:58 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=3df0bd64

cgroups: allow users to turn off creation of controller cgroups

This adds a switch to not create the one-cgroup-per-controller setup of
cgroups.

reported-by: davidweb <AT> klaftenegger.de
X-Gentoo-Bug: 423317
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=423317

---
 etc/rc.conf.Linux |    8 ++++++++
 init.d/sysfs.in   |    3 ++-
 2 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/etc/rc.conf.Linux b/etc/rc.conf.Linux
index ee23bc3..6cc9bef 100644
--- a/etc/rc.conf.Linux
+++ b/etc/rc.conf.Linux
@@ -18,3 +18,11 @@
 # This is the number of tty's used in most of the rc-scripts (like
 # consolefont, numlock, etc ...)
 rc_tty_number=12
+
+# If you have cgroups turned on in your kernel, this switch controls
+# whether or not a group for each controler is mounted under
+# /sys/fs/cgroup.
+# Support for process management by cgroups is planned in the future,
+# so if you turn this off, be aware that you may not be able to use that
+# feature.
+#rc_controller_cgroups="YES"

diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index e856775..5bc5c71 100644
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -74,7 +74,6 @@ mount_misc()
 
 mount_cgroups()
 {
-	yesno ${rc_cgroups:-YES} && [ -e /proc/cgroups ] && \
 		mountinfo -q /sys/fs/cgroup || return 0
 
 	local agent="@LIBEXECDIR@/sh/cgroup-release-agent.sh"
@@ -83,6 +82,8 @@ mount_cgroups()
 		-o none,nodev,noexec,nosuid,name=openrc,release_agent="$agent" \
 		openrc /sys/fs/cgroup/openrc
 	echo 1 > /sys/fs/cgroup/openrc/notify_on_release
+
+	yesno ${rc_controller_cgroups:-YES} && [ -e /proc/cgroups ] || return 0
 	while read name hier groups enabled rest; do
 		case "${enabled}" in
 			1)	mkdir /sys/fs/cgroup/${name}