commit: 46c71991c2f1138679d74e6c8973fd2b68a30084 Author: Mike Pagano <mpagano <AT> gentoo <DOT> org> AuthorDate: Thu Jun 12 15:26:39 2025 +0000 Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org> CommitDate: Thu Jun 12 15:26:39 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46c71991
sys-apps/lm-sensors/files: openrc service scripts clean-up Remove configurability of pid file Utilize RC_SVCNAME for pidfile Clean-up stop function Thanks to Filip Kobierski for the collaboration Closes: https://bugs.gentoo.org/957613 Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org> sys-apps/lm-sensors/files/fancontrol.initd | 11 ++++++----- sys-apps/lm-sensors/files/lm_sensors.initd | 5 +---- sys-apps/lm-sensors/files/sensord.initd | 14 +++++++------- 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/sys-apps/lm-sensors/files/fancontrol.initd b/sys-apps/lm-sensors/files/fancontrol.initd index b8e784f68028..282f205c0c61 100644 --- a/sys-apps/lm-sensors/files/fancontrol.initd +++ b/sys-apps/lm-sensors/files/fancontrol.initd @@ -2,15 +2,16 @@ # Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -FANCONTROL_CONFIGFILE=${FANCONTROL_CONFIGFILE:-"/etc/fancontrol"} -FANCONTROL_SSDARGS=${FANCONTROL_SSDARGS:-"--background --wait 1000"} -FANCONTROL_TERMTIMEOUT=${FANCONTROL_TERMTIMEOUT:-"TERM/60/KILL/5"} +command="/usr/sbin/fancontrol" +pidfile="/run/${RC_SVCNAME}.pid" + +: ${FANCONTROL_CONFIGFILE:=/etc/fancontrol} +: ${FANCONTROL_SSDARGS:=--background --wait 1000} +: ${FANCONTROL_TERMTIMEOUT:=TERM/60/KILL/5} -command="/usr/sbin/fancontrol" command_args="${FANCONTROL_CONFIGFILE}" start_stop_daemon_args="${FANCONTROL_SSDARGS}" -pidfile="/run/fancontrol.pid" retry="${FANCONTROL_TERMTIMEOUT}" required_files="${FANCONTROL_CONFIGFILE}" diff --git a/sys-apps/lm-sensors/files/lm_sensors.initd b/sys-apps/lm-sensors/files/lm_sensors.initd index 7ed503c8b0ea..562ea9585023 100644 --- a/sys-apps/lm-sensors/files/lm_sensors.initd +++ b/sys-apps/lm-sensors/files/lm_sensors.initd @@ -15,7 +15,4 @@ start() { eend $? } -stop() { - # Nothing to stop - return 0; -} +stop(){ :; } diff --git a/sys-apps/lm-sensors/files/sensord.initd b/sys-apps/lm-sensors/files/sensord.initd index fa958dbf4389..c8878ee60f0b 100644 --- a/sys-apps/lm-sensors/files/sensord.initd +++ b/sys-apps/lm-sensors/files/sensord.initd @@ -2,15 +2,15 @@ # Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -SENSORD_PIDFILE=${SENSORD_PIDFILE:-"/run/sensord.pid"} -SENSORD_SSDARGS=${SENSORD_SSDARGS:-"--wait 1000"} -SENSORD_TERMTIMEOUT=${SENSORD_TERMTIMEOUT:-"TERM/60/KILL/5"} -SENSORD_OPTS=${SENSORD_OPTS:-""} - command="/usr/sbin/sensord" -command_args="${SENSORD_OPTS} --pid-file ${SENSORD_PIDFILE}" +pidfile="/run/${RC_SVCNAME}.pid" + +: ${SENSORD_SSDARGS:=--wait 1000} +: ${SENSORD_TERMTIMEOUT:=TERM/60/KILL/5} +: ${SENSORD_OPTS:=} + +command_args="${SENSORD_OPTS} --pid-file ${pidfile}" start_stop_daemon_args="${SENSORD_SSDARGS}" -pidfile="${SENSORD_PIDFILE}" retry="${SENSORD_TERMTIMEOUT}" depend() {
