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 1RqSxq-0006yr-R3 for garchives@archives.gentoo.org; Thu, 26 Jan 2012 17:18:23 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 06CD0E0684; Thu, 26 Jan 2012 17:18:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D064BE0511 for ; Thu, 26 Jan 2012 17:18:13 +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 54A831B401C for ; Thu, 26 Jan 2012 17:18:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 98C8D80044 for ; Thu, 26 Jan 2012 17:18:12 +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: de5cee2c217e5ed606db19ca1433686048303297 Date: Thu, 26 Jan 2012 17:18:12 +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: 6d0f4b53-c967-4ba1-8a93-f573f390ca8f X-Archives-Hash: 855f26efb12d267f34c7e2dc0321df8d commit: de5cee2c217e5ed606db19ca1433686048303297 Author: William Hubbs gentoo org> AuthorDate: Thu Jan 26 17:02:00 2012 +0000 Commit: William Hubbs gentoo org> CommitDate: Thu Jan 26 17:02:00 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/openrc.git;a=3D= commit;h=3Dde5cee2c cgroups: make sure /sys/fs/cgroup is a mount point We need to make sure this directory is a mount point before we add the control groups. Reported-by: Andrej Filipcic ijs.si> X-Gentoo-Bug: 400903 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=3D400903 --- init.d/sysfs.in | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/init.d/sysfs.in b/init.d/sysfs.in index 962fcfd..8ba988a 100644 --- a/init.d/sysfs.in +++ b/init.d/sysfs.in @@ -74,10 +74,8 @@ mount_misc() =20 mount_cgroups() { - yesno ${rc_cgroups:-YES} || return 0 - if [ ! -e /proc/cgroups ]; then - return 0 - fi + yesno ${rc_cgroups:-YES} && [ -e /proc/cgroups ] && \ + mountinfo -q /sys/fs/cgroup || return 0 =20 local agent=3D"@LIBEXECDIR@/sh/cgroup-release-agent.sh" mkdir /sys/fs/cgroup/openrc