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 8734013838B for ; Tue, 16 Sep 2014 23:25:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8DAB4E096E; Tue, 16 Sep 2014 23:25:24 +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 3A6CAE096E for ; Tue, 16 Sep 2014 23:25:24 +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 41BFA33FCF3 for ; Tue, 16 Sep 2014 23:25:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 497A75BE1 for ; Tue, 16 Sep 2014 22:45:59 +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: <1410907470.e860b7cb4f3749528ae3db0f3cb500ef889d2781.williamh@OpenRC> 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: e860b7cb4f3749528ae3db0f3cb500ef889d2781 X-VCS-Branch: master Date: Tue, 16 Sep 2014 22:45:59 +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: 56f75ffd-011d-47d1-99ba-0684317ee66b X-Archives-Hash: 03cf86fa4978a7e1c693b39175f48902 commit: e860b7cb4f3749528ae3db0f3cb500ef889d2781 Author: William Hubbs gmail com> AuthorDate: Tue Sep 16 22:44:30 2014 +0000 Commit: William Hubbs gentoo org> CommitDate: Tue Sep 16 22:44:30 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=e860b7cb Revert "sysfs: fix permissions on cgroup mounts" This reverts commit 7a25491ced95e14b04b8fe6225171564c87fcde0. This was broken; I need to look further into it. --- init.d/sysfs.in | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/init.d/sysfs.in b/init.d/sysfs.in index 1e861ef..67485c2 100644 --- a/init.d/sysfs.in +++ b/init.d/sysfs.in @@ -101,12 +101,11 @@ mount_cgroups() { mountinfo -q /sys/fs/cgroup || return 0 - local opts="${sysfs_opts},mode=755" 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,${opts},name=openrc,release_agent="$agent" \ + -o none,${sysfs_opts},name=openrc,release_agent="$agent" \ openrc /sys/fs/cgroup/openrc echo 1 > /sys/fs/cgroup/openrc/notify_on_release fi @@ -115,7 +114,7 @@ mount_cgroups() while read name hier groups enabled rest; do case "${enabled}" in 1) mkdir /sys/fs/cgroup/${name} - mount -n -t cgroup -o ${opts},${name} \ + mount -n -t cgroup -o ${sysfs_opts},${name} \ ${name} /sys/fs/cgroup/${name} ;; esac