From d385bbe7526c8462282ce7232a0fb7e3f8ae4552 Mon Sep 17 00:00:00 2001 From: Rosen Penev Date: Thu, 5 Mar 2020 18:07:40 -0800 Subject: [PATCH] acpid: convert to procd acpid has no option -x, so removed. Signed-off-by: Rosen Penev --- utils/acpid/Makefile | 2 +- utils/acpid/files/acpid.init | 24 +++++++++--------------- 2 files changed, 10 insertions(+), 16 deletions(-) diff --git a/utils/acpid/Makefile b/utils/acpid/Makefile index 97f9c51d8..5217c2962 100644 --- a/utils/acpid/Makefile +++ b/utils/acpid/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=acpid PKG_VERSION:=2.0.32 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@SF/acpid2 diff --git a/utils/acpid/files/acpid.init b/utils/acpid/files/acpid.init index 3365aa022..c860327ca 100644 --- a/utils/acpid/files/acpid.init +++ b/utils/acpid/files/acpid.init @@ -4,22 +4,16 @@ START=99 STOP=80 -ACPID_BIN="/usr/sbin/acpid" -ACPID_PID="/var/run/acpid.pid" +USE_PROCD=1 -start() { - [ -x "$ACPID_BIN" ] || return 1 - start-stop-daemon -S -x $ACPID_BIN -p $ACPID_PID +start_service() { + procd_open_instance + procd_set_param command "/usr/sbin/acpid" + procd_append_param command -f + procd_append_param command -S + procd_set_param pidfile "/var/run/acpid.pid" } -boot() { - # Do nothing on boot - [ -x "$ACPID_BIN" ] || return 1 - start-stop-daemon -S -x $ACPID_BIN -p $ACPID_PID - exit 0 -} - -stop() { - service_kill ${ACPID_BIN##*/} $ACPID_PID - rm -f $ACPID_PID +reload_service()\ { + procd_send_signal "acpid" }