From: Daniel Kuehn <lejonet@gentoo.org>
Date: Mon, 26 Jun 2017 18:59:09 +0000 (+0200)
Subject: sys-libs/musl-nscd: Fix initscript
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=9f65807a31384fa03c6e587402139aaaba0bc20a;p=gentoo.git

sys-libs/musl-nscd: Fix initscript

Fix initscript to reference PIDFILE variable from conf.d config instead
of trying to do a subshell that is grepping strings of the binary
---

diff --git a/sys-libs/musl-nscd/files/nscd.initd b/sys-libs/musl-nscd/files/nscd.initd
index 929d1016df79..1bf83e7808af 100644
--- a/sys-libs/musl-nscd/files/nscd.initd
+++ b/sys-libs/musl-nscd/files/nscd.initd
@@ -43,20 +43,16 @@ start() {
 		;;
 		esac
 		done < /etc/nsswitch.conf`
-	local pidfile="$(strings /usr/sbin/nscd | grep nscd.pid)"
-	mkdir -p "$(dirname ${pidfile})"
-	save_options pidfile "${pidfile}"
+	mkdir -p "$(dirname ${PIDFILE:-/var/run/nscd/nscd.pid})"
 	start-stop-daemon --start --quiet \
-		--exec /usr/sbin/nscd --pidfile "${pidfile}" \
+		--exec /usr/sbin/nscd --pidfile "${PIDFILE:-/var/run/nscd/nscd.pid}" \
 		-- $secure
 	eend $?
 }
 
 stop() {
-	local pidfile="$(get_options pidfile)"
-	[ -n "${pidfile}" ] && pidfile="--pidfile ${pidfile}"
 	ebegin "Shutting down Name Service Cache Daemon"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/nscd ${pidfile}
+	start-stop-daemon --stop --quiet --exec /usr/sbin/nscd --pidfile "${PIDFILE:-/var/run/nscd/nscd.pid}"
 	eend $?
 }