summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Hubbs <w.d.hubbs@gmail.com>2013-09-25 20:05:41 -0500
committerWilliam Hubbs <w.d.hubbs@gmail.com>2013-10-02 05:43:51 -0500
commita530722f653e13407ac0638cfcad8e938f602493 (patch)
treeef3f6f0f9cc9bd89a25d64c29b1c59622229aa89
parent661e9cf00211b712c3d88b8e3a18a40906f22468 (diff)
downloadopenrc-0.12.1.tar.gz
openrc-0.12.1.tar.bz2
openrc-0.12.1.tar.xz
fix cgroup_cleanup functionopenrc-0.12.1
The yesno test for rc_cgroup_cleanup belongs at the point where this function is called from runscript, not in the function itself. X-Gentoo-Bug: 486210 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=486210
-rw-r--r--sh/rc-cgroup.sh.in2
-rw-r--r--sh/runscript.sh.in1
2 files changed, 2 insertions, 1 deletions
diff --git a/sh/rc-cgroup.sh.in b/sh/rc-cgroup.sh.in
index 9329b57..b635340 100644
--- a/sh/rc-cgroup.sh.in
+++ b/sh/rc-cgroup.sh.in
@@ -116,7 +116,7 @@ cgroup_set_limits()
cgroup_cleanup()
{
- yesno "${rc_cgroup_cleanup:-no}" && cgroup_running || return 0
+ cgroup_running || return 0
ebegin "starting cgroups cleanup"
for sig in TERM QUIT INT; do
cgroup_get_pids || { eend 0 "finished" ; return 0 ; }
diff --git a/sh/runscript.sh.in b/sh/runscript.sh.in
index a1ed9c6..f8fcbc5 100644
--- a/sh/runscript.sh.in
+++ b/sh/runscript.sh.in
@@ -308,6 +308,7 @@ while [ -n "$1" ]; do
fi
[ "$(command -v cgroup_cleanup)" = "cgroup_cleanup" -a \
"$1" = "stop" ] && \
+ yesno "${rc_cgroup_cleanup}" && \
cgroup_cleanup
shift
continue 2