[patch] 0001-sysfs-always-allow-mounting-of-cgroup-subsystems.patch

0001-sysfs-always-allow-mounting-of-cgroup-subsystems.patch (text/plain), 1.53 KB, created by William Hubbs on 2014-08-22 18:06:21 UTC

From 8842414015bc785930934b029b1e6c1ca6446520 Mon Sep 17 00:00:00 2001
From: William Hubbs <[e-mail]>
Date: Fri, 22 Aug 2014 12:41:55 -0500
Subject: [PATCH] sysfs: always allow mounting of cgroup subsystems

Originally, we aborted all of the cgroup setup if /sys/fs/cgroup/openrc
was already mounted. This  caused an issue in lxc containers, so we
should always allow the subsystems to be mounted.

X-Gentoo-Bug: 520606
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=520606
---
 init.d/sysfs.in | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index 2156670..67485c2 100644
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -100,14 +100,15 @@ mount_misc()
 mount_cgroups()
 {
 	mountinfo -q /sys/fs/cgroup || return 0
-	mountinfo -q /sys/fs/cgroup/openrc || return 0
-
-	local agent="@LIBEXECDIR@/sh/cgroup-release-agent.sh"
-	mkdir /sys/fs/cgroup/openrc
-	mount -n -t cgroup \
-		-o none,${sysfs_opts},name=openrc,release_agent="$agent" \
-		openrc /sys/fs/cgroup/openrc
-	echo 1 > /sys/fs/cgroup/openrc/notify_on_release
+
+	if ! mountinfo -q /sys/fs/cgroup/openrc; then
+		local agent="@LIBEXECDIR@/sh/cgroup-release-agent.sh"
+		mkdir /sys/fs/cgroup/openrc
+		mount -n -t cgroup \
+			-o none,${sysfs_opts},name=openrc,release_agent="$agent" \
+			openrc /sys/fs/cgroup/openrc
+		echo 1 > /sys/fs/cgroup/openrc/notify_on_release
+	fi
 
 	yesno ${rc_controller_cgroups:-YES} && [ -e /proc/cgroups ] || return 0
 	while read name hier groups enabled rest; do
-- 
1.8.5.5