diff options
| author | Robin H. Johnson <robbat2@gentoo.org> | 2013-06-24 21:30:43 +0000 |
|---|---|---|
| committer | Robin H. Johnson <robbat2@gentoo.org> | 2013-06-24 21:30:43 +0000 |
| commit | ccb8c5835c2c59d8f85aec531da8a75f004b030b (patch) | |
| tree | 0e11ef78ea21951f212225f0abfb60f3e5f3d864 | |
| parent | 29f0f55c0e7debef879674ed288c1d3af0f84772 (diff) | |
| parent | 02a7d3573d551c5d169eaa465ef90349d1ee367e (diff) | |
Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/openrc
| -rw-r--r-- | sh/cgroup-release-agent.sh.in | 4 | ||||
| -rw-r--r-- | sh/rc-cgroup.sh.in | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sh/cgroup-release-agent.sh.in b/sh/cgroup-release-agent.sh.in index c3174fee..d6dd1e1e 100644 --- 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 index 81fc7d86..d96aa164 100644 --- 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 |