diff options
| -rw-r--r-- | net/apcupsd/Makefile | 4 | ||||
| -rw-r--r-- | net/apcupsd/files/apccontrol | 6 | ||||
| -rw-r--r-- | net/apcupsd/patches/015-drop-doc.patch | 10 |
3 files changed, 16 insertions, 4 deletions
diff --git a/net/apcupsd/Makefile b/net/apcupsd/Makefile index da18a0e16..5e4974c95 100644 --- a/net/apcupsd/Makefile +++ b/net/apcupsd/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=apcupsd PKG_VERSION:=3.14.14 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_MAINTAINER:=Othmar Truniger <github@truniger.ch> PKG_LICENSE:=GPL-2.0 @@ -39,6 +39,8 @@ define Package/apcupsd-cgi URL:=http://www.apcupsd.org/ endef +CONFIGURE_VARS += SHUTDOWN=/sbin/halt + define Build/Configure $(CP) $(SCRIPT_DIR)/config.* $(PKG_BUILD_DIR)/autoconf/ $(call Build/Configure/Default, \ diff --git a/net/apcupsd/files/apccontrol b/net/apcupsd/files/apccontrol index 254935418..740298f3b 100644 --- a/net/apcupsd/files/apccontrol +++ b/net/apcupsd/files/apccontrol @@ -20,7 +20,7 @@ exec_prefix=/usr APCPID=/var/run/apcupsd.pid APCUPSD=/usr/sbin/apcupsd -SHUTDOWN=/sbin/shutdown +SHUTDOWN=/sbin/halt SCRIPTSHELL=/bin/sh SCRIPTDIR=/etc/apcupsd WALL=true @@ -101,11 +101,11 @@ case "$1" in ;; doreboot) echo "UPS ${2} initiating Reboot Sequence" | ${WALL} - ${SHUTDOWN} -r now "apcupsd UPS ${2} initiated reboot" + echo "apcupsd UPS ${2} initiated reboot" && /sbin/reboot ;; doshutdown) echo "UPS ${2} initiated Shutdown Sequence" | ${WALL} - ${SHUTDOWN} -h now "apcupsd UPS ${2} initiated shutdown" + echo "apcupsd UPS ${2} initiated shutdown" && /sbin/halt ;; annoyme) echo "Power problems with UPS ${2}. Please logoff." | ${WALL} diff --git a/net/apcupsd/patches/015-drop-doc.patch b/net/apcupsd/patches/015-drop-doc.patch new file mode 100644 index 000000000..fb90b22c0 --- /dev/null +++ b/net/apcupsd/patches/015-drop-doc.patch @@ -0,0 +1,10 @@ +--- a/Makefile.orig 2019-04-04 18:19:45.007668656 +0200 ++++ a/Makefile 2019-04-04 18:23:00.723165465 +0200 +@@ -1,6 +1,6 @@ + topdir:=. + +-SUBDIRS=src platforms doc ++SUBDIRS=src platforms + include autoconf/targets.mak + + # Force platforms/ to build after src/ |