aboutsummaryrefslogtreecommitdiff
path: root/init.d
diff options
context:
space:
mode:
authorWilliam Hubbs <w.d.hubbs@gmail.com>2014-09-16 17:44:30 -0500
committerWilliam Hubbs <w.d.hubbs@gmail.com>2014-09-16 17:44:30 -0500
commite860b7cb4f3749528ae3db0f3cb500ef889d2781 (patch)
tree522eccff58d8d1b1d8f746d8894aa166a703c5eb /init.d
parent7a25491ced95e14b04b8fe6225171564c87fcde0 (diff)
Revert "sysfs: fix permissions on cgroup mounts"
This reverts commit 7a25491ced95e14b04b8fe6225171564c87fcde0. This was broken; I need to look further into it.
Diffstat (limited to 'init.d')
-rw-r--r--init.d/sysfs.in5
1 files changed, 2 insertions, 3 deletions
diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index 1e861ef3..67485c24 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