summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Arnold <nerdboy@gentoo.org>2019-07-27 15:47:46 -0700
committerStephen Arnold <nerdboy@gentoo.org>2019-07-27 15:47:46 -0700
commitf210149eaacd6e727606a316c0b5c864f4e9e6c8 (patch)
treef8a35686c720bcea36777b1378e2f28ffc7d29ed /app-admin/hddtemp
parentnet-libs/gupnp: arm64 stable (diff)
downloadgentoo-f210149eaacd6e727606a316c0b5c864f4e9e6c8.tar.gz
gentoo-f210149eaacd6e727606a316c0b5c864f4e9e6c8.tar.bz2
gentoo-f210149eaacd6e727606a316c0b5c864f4e9e6c8.zip
app-admin/hddtemp: simplify and correct baseline init script
* 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>
Diffstat (limited to 'app-admin/hddtemp')
-rw-r--r--app-admin/hddtemp/files/hddtemp-init22
-rw-r--r--app-admin/hddtemp/files/hddtemp-init-r111
-rw-r--r--app-admin/hddtemp/hddtemp-0.3_beta15-r28.ebuild2
3 files changed, 12 insertions, 23 deletions
diff --git a/app-admin/hddtemp/files/hddtemp-init b/app-admin/hddtemp/files/hddtemp-init
deleted file mode 100644
index 39a640997cfe..000000000000
--- a/app-admin/hddtemp/files/hddtemp-init
+++ /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
index 000000000000..00d09ac2c610
--- /dev/null
+++ b/app-admin/hddtemp/files/hddtemp-init-r1
@@ -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
+}
diff --git a/app-admin/hddtemp/hddtemp-0.3_beta15-r28.ebuild b/app-admin/hddtemp/hddtemp-0.3_beta15-r28.ebuild
index c1ffdee13a6c..293c78379cae 100644
--- a/app-admin/hddtemp/hddtemp-0.3_beta15-r28.ebuild
+++ b/app-admin/hddtemp/hddtemp-0.3_beta15-r28.ebuild
@@ -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