aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hubbs <williamh@gentoo.org>2011-11-17 16:42:03 -0600
committerWilliam Hubbs <williamh@gentoo.org>2011-11-17 16:42:03 -0600
commit0bbb764f70dcbaa8cfa3ffbb2b318274d1180120 (patch)
tree11357f6bbe61309d412e8a8815086b42e15dfdc2
parent20df56f0b2a01bd2f8a70b8fb3fbd051c1aab8d8 (diff)
Change RC_CGROUP to lower case
-rw-r--r--etc/rc.conf.Linux2
-rw-r--r--sh/runscript.sh.in4
2 files changed, 3 insertions, 3 deletions
diff --git a/etc/rc.conf.Linux b/etc/rc.conf.Linux
index 585da3cf..963fc68c 100644
--- a/etc/rc.conf.Linux
+++ b/etc/rc.conf.Linux
@@ -3,7 +3,7 @@
# RC_SVCNAME.
# This setting is ignored if you do not have CONFIG_CGROUPS active in
# your kernel.
-# RC_CGROUP="foo"
+# rc_cgroup="foo"
##############################################################################
# LINUX SPECIFIC OPTIONS
diff --git a/sh/runscript.sh.in b/sh/runscript.sh.in
index 73b4a595..ca9c1336 100644
--- a/sh/runscript.sh.in
+++ b/sh/runscript.sh.in
@@ -192,7 +192,7 @@ sourcex -e "@SYSCONFDIR@/rc.conf"
# Attach to CGroup - dir existing is enough for us
if [ -d /sys/fs/cgroup/ ]; then
# use RC_SVCNAME unless overridden in conf.d
- SVC_CGROUP=${RC_CGROUP:-$RC_SVCNAME}
+ SVC_CGROUP=${rc_cgroup:-$RC_SVCNAME}
mkdir -p /sys/fs/cgroup/${SVC_CGROUP}
# now attach self to cgroup - any children of this process will inherit this
echo $$ > /sys/fs/cgroup/${SVC_CGROUP}/tasks
@@ -305,7 +305,7 @@ done
# CGroup cleanup
if [ -d /sys/fs/cgroup/ ]; then
# use RC_SVCNAME unless overridden in conf.d
- SVC_CGROUP=${RC_CGROUP:-$RC_SVCNAME}
+ SVC_CGROUP=${rc_cgroup:-$RC_SVCNAME}
# reattach to root cgroup
echo $$ > /sys/fs/cgroup/tasks
# remove cgroup if empty, will fail if any task attached