From ef2972bf921da8235ed4018b7afce6837ca70b3a Mon Sep 17 00:00:00 2001 From: Jay Larson Date: Tue, 16 May 2017 13:12:58 -0500 Subject: [PATCH] Updated init script --- Makefile | 2 +- SNAP/acpid.init | 35 ++++++++++++++++++++++------------- 2 files changed, 23 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index f724ecb..7aadc96 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ ARCH = x86_64 URL = https://sourceforge.net/projects/acpid2/ BRIEF = Advanced Configuration and Power Interface event daemon DESC = Advanced Configuration and Power Interface event daemon -SNAPVER = 1 +SNAPVER = 2 ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1) TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n') diff --git a/SNAP/acpid.init b/SNAP/acpid.init index 94ed91d..0733a30 100755 --- a/SNAP/acpid.init +++ b/SNAP/acpid.init @@ -4,7 +4,7 @@ # Required-Start: $remote_fs $syslog # Required-Stop: $remote_fs $syslog # Should-Start: -# Should-Stop +# Should-Stop: # Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: Advanced Configuration and Power Interface event daemon @@ -12,31 +12,40 @@ . /lib/lsb/init-functions +DAEMON=/usr/sbin/acpid +PIDFILE=/var/run/acpid.pid + case "$1" in start) - log_info_msg "Starting ACPI event daemon" + log_init_msg "Starting ACPI event daemon" - pidofproc -p /run/acpid.pid > /dev/null && \ - echo -n " acpid already running" && log_warning_msg - - start_daemon /usr/sbin/acpid -p /run/acpid.pid && \ - log_success_msg || log_failure_msg + start_daemon "$DAEMON" && log_success_msg || log_failure_msg ;; stop) - log_info_msg "Stopping ACPI event daemon" - killproc -p "/run/acpid.pid" /usr/sbin/acpid && \ - log_success_msg || log_failure_msg + log_init_msg "Stopping ACPI event daemon" + + killproc -p "$PIDFILE" "$DAEMON" -TERM && log_success_msg || log_failure_msg + ;; + reload) + log_init_msg "Reloading configuration for ACPI event daemon" + + killproc -p "$PIDFILE" "$DAEMON" -HUP && log_success_msg || log_failure_msg ;; restart) $0 stop - sleep 1 $0 start ;; status) - statusproc /usr/sbin/acpid + pid=$(pidofproc -p "$PIDFILE" "$DAEMON") + + if [ "$?" -ne 0 ]; then + echo "ACPI event daemon not running" + else + echo "ACPI event daemon running with PID: $pid" + fi ;; *) - echo "Usage: $0 [start|stop|restart|status]" + echo "Usage: $0 [start|stop|reload|restart|status]" exit 1 ;; esac