| 1 |
commit: 0bbb764f70dcbaa8cfa3ffbb2b318274d1180120 |
| 2 |
Author: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Nov 17 22:42:03 2011 +0000 |
| 4 |
Commit: William Hubbs <williamh <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Nov 17 22:42:03 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=0bbb764f |
| 7 |
|
| 8 |
Change RC_CGROUP to lower case |
| 9 |
|
| 10 |
--- |
| 11 |
etc/rc.conf.Linux | 2 +- |
| 12 |
sh/runscript.sh.in | 4 ++-- |
| 13 |
2 files changed, 3 insertions(+), 3 deletions(-) |
| 14 |
|
| 15 |
diff --git a/etc/rc.conf.Linux b/etc/rc.conf.Linux |
| 16 |
index 585da3c..963fc68 100644 |
| 17 |
--- a/etc/rc.conf.Linux |
| 18 |
+++ b/etc/rc.conf.Linux |
| 19 |
@@ -3,7 +3,7 @@ |
| 20 |
# RC_SVCNAME. |
| 21 |
# This setting is ignored if you do not have CONFIG_CGROUPS active in |
| 22 |
# your kernel. |
| 23 |
-# RC_CGROUP="foo" |
| 24 |
+# rc_cgroup="foo" |
| 25 |
|
| 26 |
############################################################################## |
| 27 |
# LINUX SPECIFIC OPTIONS |
| 28 |
|
| 29 |
diff --git a/sh/runscript.sh.in b/sh/runscript.sh.in |
| 30 |
index 73b4a59..ca9c133 100644 |
| 31 |
--- a/sh/runscript.sh.in |
| 32 |
+++ b/sh/runscript.sh.in |
| 33 |
@@ -192,7 +192,7 @@ sourcex -e "@SYSCONFDIR@/rc.conf" |
| 34 |
# Attach to CGroup - dir existing is enough for us |
| 35 |
if [ -d /sys/fs/cgroup/ ]; then |
| 36 |
# use RC_SVCNAME unless overridden in conf.d |
| 37 |
- SVC_CGROUP=${RC_CGROUP:-$RC_SVCNAME} |
| 38 |
+ SVC_CGROUP=${rc_cgroup:-$RC_SVCNAME} |
| 39 |
mkdir -p /sys/fs/cgroup/${SVC_CGROUP} |
| 40 |
# now attach self to cgroup - any children of this process will inherit this |
| 41 |
echo $$ > /sys/fs/cgroup/${SVC_CGROUP}/tasks |
| 42 |
@@ -305,7 +305,7 @@ done |
| 43 |
# CGroup cleanup |
| 44 |
if [ -d /sys/fs/cgroup/ ]; then |
| 45 |
# use RC_SVCNAME unless overridden in conf.d |
| 46 |
- SVC_CGROUP=${RC_CGROUP:-$RC_SVCNAME} |
| 47 |
+ SVC_CGROUP=${rc_cgroup:-$RC_SVCNAME} |
| 48 |
# reattach to root cgroup |
| 49 |
echo $$ > /sys/fs/cgroup/tasks |
| 50 |
# remove cgroup if empty, will fail if any task attached |
Archives