From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 8A34013877A for ; Fri, 22 Aug 2014 19:21:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A4805E084B; Fri, 22 Aug 2014 19:21:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 48206E0838 for ; Fri, 22 Aug 2014 19:21:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 34FCD33F8DF for ; Fri, 22 Aug 2014 19:21:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D6BCC3BEB for ; Fri, 22 Aug 2014 19:21:53 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: <1408735143.785b61e8725f26b7d7c66b00e6e87597dd7bd735.williamh@OpenRC> Subject: [gentoo-commits] proj/openrc:openrc-0.13.x commit in: init.d/ X-VCS-Repository: proj/openrc X-VCS-Files: init.d/sysfs.in X-VCS-Directories: init.d/ X-VCS-Committer: williamh X-VCS-Committer-Name: William Hubbs X-VCS-Revision: 785b61e8725f26b7d7c66b00e6e87597dd7bd735 X-VCS-Branch: openrc-0.13.x Date: Fri, 22 Aug 2014 19:21:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 11f4216f-0b2b-43e8-8b74-e4eb48d32d0d X-Archives-Hash: ad936154b0ce3ec0974ec1799cfd1eea commit: 785b61e8725f26b7d7c66b00e6e87597dd7bd735 Author: William Hubbs gmail com> AuthorDate: Fri Aug 22 17:41:55 2014 +0000 Commit: William Hubbs gentoo org> CommitDate: Fri Aug 22 19:19:03 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=785b61e8 cgroups: fix cgroup subsystem mounting 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