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

qnikst · Jun 24, 2013 · ccb8c58 · ccb8c58
2 parents 29f0f55 + 02a7d35
commit ccb8c58
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
diff --git 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