From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RcuSc-0004Ye-EL for garchives@archives.gentoo.org; Tue, 20 Dec 2011 07:50:06 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EFAB921C09F; Tue, 20 Dec 2011 07:49:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id AEE9821C09F for ; Tue, 20 Dec 2011 07:49:57 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3563A1B400A for ; Tue, 20 Dec 2011 07:49:57 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 7345280042 for ; Tue, 20 Dec 2011 07:49:56 +0000 (UTC) From: "William Hubbs" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "William Hubbs" Message-ID: Subject: [gentoo-commits] proj/openrc:master 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: f6dc3d5ae91ff6a660cf71a92d4a3a120b1180a4 Date: Tue, 20 Dec 2011 07:49:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 742da500-b67a-4004-9d93-381e326963a3 X-Archives-Hash: a107e77220303f2320a2bb3da8f9a568 commit: f6dc3d5ae91ff6a660cf71a92d4a3a120b1180a4 Author: William Hubbs gentoo org> AuthorDate: Tue Dec 20 07:42:36 2011 +0000 Commit: William Hubbs gentoo org> CommitDate: Tue Dec 20 07:42:36 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/openrc.git;a=3D= commit;h=3Df6dc3d5a cgroups: always mount the tmpfs on /sys/fs/cgroup X-Gentoo-Bug:395079 X-Gentoo-Bug-URL:https://bugs.gentoo.org/show_bug.cgi?id=3D395079 --- init.d/sysfs.in | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/init.d/sysfs.in b/init.d/sysfs.in index a709e5d..8809bda 100644 --- a/init.d/sysfs.in +++ b/init.d/sysfs.in @@ -60,15 +60,8 @@ mount_misc() eend $? fi fi -} - -mount_cgroups() -{ - yesno ${rc_cgroups:-NO} || return 0 - if [ ! -e /proc/cgroups ]; then - return 0 - fi =20 + # set up kernel support for cgroups if [ -d /sys/fs/cgroup ] && ! mountinfo -q /sys/fs/cgroup; then if grep -qs cgroup /proc/filesystems; then ebegin "Mounting cgroup filesystem" @@ -77,6 +70,14 @@ mount_cgroups() eend $? fi fi +} + +mount_cgroups() +{ + yesno ${rc_cgroups:-NO} || return 0 + if [ ! -e /proc/cgroups ]; then + return 0 + fi =20 while read name hier groups enabled rest; do case "${enabled}" in