diff --git a/net/vnstat/Makefile b/net/vnstat/Makefile index 1a526fd92..e69b5b036 100644 --- a/net/vnstat/Makefile +++ b/net/vnstat/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=vnstat PKG_VERSION:=1.18 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://humdi.net/vnstat diff --git a/net/vnstat/files/vnstat.init b/net/vnstat/files/vnstat.init index 7921cbcde..bfd99f8ae 100644 --- a/net/vnstat/files/vnstat.init +++ b/net/vnstat/files/vnstat.init @@ -3,25 +3,21 @@ START=99 +USE_PROCD=1 + vnstat_option() { sed -ne "s/^[[:space:]]*$1[[:space:]]*['\"]\([^'\"]*\)['\"].*/\1/p" \ /etc/vnstat.conf } -start() { +start_service() { local lib="$(vnstat_option DatabaseDir)" - local pid="$(vnstat_option PidFile)" [ -n "$lib" ] || { echo "Error: No DatabaseDir set in vnstat.conf" >&2 exit 1 } - [ -n "$pid" ] || { - echo "Error: No PidFile set in vnstat.conf" >&2 - exit 1 - } - mkdir -p "$lib" init_ifaces() { @@ -72,18 +68,19 @@ start() { config_load vnstat config_foreach init_ifaces vnstat - SERVICE_PID_FILE="${pid}" - service_start /usr/sbin/vnstatd -d + procd_open_instance + procd_set_param stdout 1 + procd_set_param stderr 1 + procd_set_param command /usr/sbin/vnstatd --nodaemon + procd_set_param file /etc/vnstat.conf + procd_set_param respawn + procd_close_instance } -stop() { - local pid="$(vnstat_option PidFile)" - - [ -n "$pid" ] || { - echo "Error: No PidFile set in vnstat.conf" >&2 - exit 1 - } +reload_service() { + procd_send_signal vnstat +} - SERVICE_PID_FILE="${pid}" - service_stop /usr/sbin/vnstatd +service_triggers() { + procd_add_reload_trigger vnstat }