app-admin/hddtemp: simplify and correct baseline init script
authorStephen Arnold <nerdboy@gentoo.org>
Sat, 27 Jul 2019 22:47:46 +0000 (15:47 -0700)
committerStephen Arnold <nerdboy@gentoo.org>
Sat, 27 Jul 2019 22:47:46 +0000 (15:47 -0700)
* some environments (eg, musl hardened) do not work properly with the
  pidfile arg, so fall back to procname for correct rc-status

Package-Manager: Portage-2.3.67, Repoman-2.3.12
Signed-off-by: Steve Arnold <nerdboy@gentoo.org>
app-admin/hddtemp/files/hddtemp-init [deleted file]
app-admin/hddtemp/files/hddtemp-init-r1 [new file with mode: 0644]
app-admin/hddtemp/hddtemp-0.3_beta15-r28.ebuild

diff --git a/app-admin/hddtemp/files/hddtemp-init b/app-admin/hddtemp/files/hddtemp-init
deleted file mode 100644 (file)
index 39a6409..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
-       need localmount
-}
-
-start() {
-       ebegin "Starting hddtemp daemon"
-       /sbin/start-stop-daemon --start --quiet --exec ${HDDTEMP_EXEC} \
-       -- -d ${HDDTEMP_OPTS} ${HDDTEMP_DRIVES}
-       eend $?
-}
-
-stop() {
-       ebegin "Stopping hddtemp daemon"
-       start-stop-daemon --stop --quiet --exec ${HDDTEMP_EXEC}
-       eend $?
-}
-
-
diff --git a/app-admin/hddtemp/files/hddtemp-init-r1 b/app-admin/hddtemp/files/hddtemp-init-r1
new file mode 100644 (file)
index 0000000..00d09ac
--- /dev/null
@@ -0,0 +1,11 @@
+#!/sbin/openrc-run
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command="${HDDTEMP_EXEC}"
+command_args="-d ${HDDTEMP_OPTS} ${HDDTEMP_DRIVES}"
+procname="hddtemp"
+
+depend() {
+       need localmount
+}
index c1ffdee13a6c6753e2e77ae4a469598173391c72..293c78379cae13bebfdde47507d47710bb35b442 100644 (file)
@@ -70,7 +70,7 @@ src_install() {
 
        update_db "${ED}/usr/share/hddtemp/hddgentoo.db" "${ED}/usr/share/hddtemp/hddtemp.db"
        newconfd "${FILESDIR}"/hddtemp-conf.d hddtemp
-       newinitd "${FILESDIR}"/hddtemp-init hddtemp
+       newinitd "${FILESDIR}"/hddtemp-init-r1 hddtemp
        systemd_newunit "${FILESDIR}"/hddtemp.service-r1 "${PN}.service"
        systemd_install_serviced "${FILESDIR}"/hddtemp.service.conf