From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-732798-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 1D2DD13838B for <garchives@archives.gentoo.org>; Tue, 16 Sep 2014 20:19:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A4826E0E0E; Tue, 16 Sep 2014 20:19:49 +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 50A33E0E0E for <gentoo-commits@lists.gentoo.org>; Tue, 16 Sep 2014 20:19:49 +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 75A543401A1 for <gentoo-commits@lists.gentoo.org>; Tue, 16 Sep 2014 20:19:48 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 32E915BAA for <gentoo-commits@lists.gentoo.org>; Tue, 16 Sep 2014 20:19:47 +0000 (UTC) From: "William Hubbs" <williamh@gentoo.org> 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" <williamh@gentoo.org> Message-ID: <1410898452.7a25491ced95e14b04b8fe6225171564c87fcde0.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: 7a25491ced95e14b04b8fe6225171564c87fcde0 X-VCS-Branch: master Date: Tue, 16 Sep 2014 20:19:47 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 728df759-4b94-4052-b018-821ec356d89f X-Archives-Hash: 2f002d6ca2a9fc5fc21f88e3dfab915c commit: 7a25491ced95e14b04b8fe6225171564c87fcde0 Author: William Hubbs <w.d.hubbs <AT> gmail <DOT> com> AuthorDate: Tue Sep 16 20:14:12 2014 +0000 Commit: William Hubbs <williamh <AT> gentoo <DOT> org> CommitDate: Tue Sep 16 20:14:12 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=7a25491c sysfs: fix permissions on cgroup mounts --- init.d/sysfs.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/init.d/sysfs.in b/init.d/sysfs.in index 67485c2..1e861ef 100644 --- a/init.d/sysfs.in +++ b/init.d/sysfs.in @@ -101,11 +101,12 @@ 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,${sysfs_opts},name=openrc,release_agent="$agent" \ + -o none,${opts},name=openrc,release_agent="$agent" \ openrc /sys/fs/cgroup/openrc echo 1 > /sys/fs/cgroup/openrc/notify_on_release fi @@ -114,7 +115,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 ${sysfs_opts},${name} \ + mount -n -t cgroup -o ${opts},${name} \ ${name} /sys/fs/cgroup/${name} ;; esac