Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #8830 from cshoredaniel/pr-nut-nutmon+fsd-fixes

Browse source 
nut: nutmon+fsd fixes
This commit is contained in:
Rosen Penev 2019-04-28 14:24:31 -07:00 committed by GitHub
commit 0038d6e971
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/nut/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=nut PKG_NAME:=nut
PKG_VERSION:=2.7.4 PKG_VERSION:=2.7.4
PKG_RELEASE:=15 PKG_RELEASE:=16
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://www.networkupstools.org/source/2.7/ PKG_SOURCE_URL:=http://www.networkupstools.org/source/2.7/

15
net/nut/files/nut-monitor.init
View file

@ -148,7 +148,6 @@ nut_upsmon_add() {
} }
build_config() { build_config() {
local runas=nutmon
mkdir -m 0750 -p "$(dirname "$UPSMON_C")" mkdir -m 0750 -p "$(dirname "$UPSMON_C")"
config_load nut_monitor config_load nut_monitor
@ -193,6 +192,7 @@ interface_triggers() {
} }
start_service() { start_service() {
local runas=nutmon
local havemon havems local havemon havems
build_config build_config
@ -210,16 +210,9 @@ start_service() {
return 0 return 0
} }
restart() {
trap '' TERM
stop "$@"
sleep 2
trap - TERM
start "$@"
}
reload_service() { reload_service() {
if pgrep upsmon >/dev/null 2>/dev/null; then if pgrep upsmon >/dev/null 2>/dev/null; then
local runas=nutmon
build_config build_config
/usr/sbin/upsmon -c reload /usr/sbin/upsmon -c reload
else else
@ -227,6 +220,10 @@ reload_service() {
fi fi
} }
stop_service() {
upsmon -c stop
}
service_triggers() { service_triggers() {
config_load nut_monitor config_load nut_monitor
interface_triggers "add_trigger" interface_triggers "add_trigger"

2
net/nut/files/nutshutdown
View file

@ -47,3 +47,5 @@ do_fsd() {
poweroff poweroff
fi fi
} }
do_fsd