Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/openrc

2013-06-24 21:30:43 +00:00 · 2013-06-24 21:30:43 +00:00 · ccb8c5835c
commit ccb8c5835c
parent 29f0f55c0e 02a7d3573d
2 changed files with 3 additions and 3 deletions
--- a/sh/cgroup-release-agent.sh.in
+++ b/sh/cgroup-release-agent.sh.in
@ -5,6 +5,6 @@

 cgroup=/sys/fs/cgroup/openrc
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
-if [ -d ${cgroup}/$1 ]; then
-	rmdir ${cgroup}/$1
+if [ -d ${cgroup}/"$1" ]; then
+	rmdir ${cgroup}/"$1"
 fi
--- a/sh/rc-cgroup.sh.in
+++ b/sh/rc-cgroup.sh.in
@ -115,7 +115,7 @@ cgroup_cleanup()
 				cgroup_get_pids || { eend 0 "finished" ; return 0 ; }
 				sleep 1
 			done
-		done
+		done 2>/dev/null
 	done
 	cgroup_get_pids || { eend 0 "finished" ; return 0; }
 	kill -9 $pids