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

This commit is contained in:
Robin H. Johnson 2013-06-24 21:30:43 +00:00
commit ccb8c5835c
2 changed files with 3 additions and 3 deletions

View File

@ -5,6 +5,6 @@
cgroup=/sys/fs/cgroup/openrc cgroup=/sys/fs/cgroup/openrc
PATH=/bin:/usr/bin:/sbin:/usr/sbin PATH=/bin:/usr/bin:/sbin:/usr/sbin
if [ -d ${cgroup}/$1 ]; then if [ -d ${cgroup}/"$1" ]; then
rmdir ${cgroup}/$1 rmdir ${cgroup}/"$1"
fi fi

View File

@ -115,7 +115,7 @@ cgroup_cleanup()
cgroup_get_pids || { eend 0 "finished" ; return 0 ; } cgroup_get_pids || { eend 0 "finished" ; return 0 ; }
sleep 1 sleep 1
done done
done done 2>/dev/null
done done
cgroup_get_pids || { eend 0 "finished" ; return 0; } cgroup_get_pids || { eend 0 "finished" ; return 0; }
kill -9 $pids kill -9 $pids