fix cgroup_cleanup function

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

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 ; }

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