commit: 49a881ac2c9c2725ae8f869afea1fe932f97b1ac
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 5 09:35:16 2020 +0000
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Dec 5 09:35:32 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49a881ac
app-admin/diamond: (stable) revbump for init.d fix
Ensure a missing pid-file doesn't result in more killing than healthy.
Package-Manager: Portage-3.0.9, Repoman-3.0.2
RepoMan-Options: --force
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
...nd-4.0.515.20170311.ebuild => diamond-4.0.515.20170311-r1.ebuild} | 0
...nd-4.0.515.20200620.ebuild => diamond-4.0.515.20200620-r1.ebuild} | 0
app-admin/diamond/files/diamond.initd | 5 ++++-
3 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/app-admin/diamond/diamond-4.0.515.20170311.ebuild
b/app-admin/diamond/diamond-4.0.515.20170311-r1.ebuild
similarity index 100%
rename from app-admin/diamond/diamond-4.0.515.20170311.ebuild
rename to app-admin/diamond/diamond-4.0.515.20170311-r1.ebuild
diff --git a/app-admin/diamond/diamond-4.0.515.20200620.ebuild
b/app-admin/diamond/diamond-4.0.515.20200620-r1.ebuild
similarity index 100%
rename from app-admin/diamond/diamond-4.0.515.20200620.ebuild
rename to app-admin/diamond/diamond-4.0.515.20200620-r1.ebuild
diff --git a/app-admin/diamond/files/diamond.initd
b/app-admin/diamond/files/diamond.initd
index a2383fd3187..f9b829488c7 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 $?
}
