diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2020-12-14 13:26:14 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2020-12-14 13:26:14 +0000 |
| commit | 6abbf81ef2f298e3221ff5e67a1f3c5f23958212 (patch) | |
| tree | 25413d1cb3a0cbfe36029db32398c0f333609215 /app-admin/diamond/files | |
| parent | 9c417bacd51da6d8b57fa9f37425161d30d4b95b (diff) | |
gentoo resync : 14.12.2020
Diffstat (limited to 'app-admin/diamond/files')
| -rw-r--r-- | app-admin/diamond/files/diamond.initd | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app-admin/diamond/files/diamond.initd b/app-admin/diamond/files/diamond.initd index a2383fd31875..f9b829488c79 100644 --- a/app-admin/diamond/files/diamond.initd +++ b/app-admin/diamond/files/diamond.initd @@ -16,6 +16,9 @@ stop() { ebegin "Stopping ${SVCNAME}" #start-stop-daemon --stop -R 80 --pidfile /run/${SVCNAME}.pid # diamond doesn't kill its children, so work around that for now - pstree -Tp `cat /run/${SVCNAME}.pid` | grep -o '([0-9]\+)' | tr '()' ' ' | xargs kill + pid=$(< /run/${SVCNAME}.pid) + if [ -n ${pid} ] && [ ${pid} -gt 1 ] ; then + pstree -Tp ${pid} | grep -o '([0-9]\+)' | tr '()' ' ' | xargs kill + fi eend $? } |