knxd: use procd (refs #2233)

Signed-off-by: Patrick Grimm <patrick@lunatiki.de>
Acked-by: Othmar Truniger <github@truniger.ch>
[Squashed patches from PR]

Signed-off-by: Michael Heimpold <mhei@heimpold.de>

diff --git a/net/knxd/Makefile b/net/knxd/Makefile
index 584266f5abc2761a10ff4c9812afaae50de56d70..a9885464ffe749739780a3547fed074f91e68c8e 100644 (file)
--- a/net/knxd/Makefile
+++ b/net/knxd/Makefile
@@ -12,7 +12,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=knxd
 PKG_VERSION=2016-01-01-$(PKG_SOURCE_VERSION)
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/knxd/knxd.git

diff --git a/net/knxd/files/knxd.init b/net/knxd/files/knxd.init
index 026e4cf6aba529a7f49f64b88594c4136956ff00..bb3e777d5dff50c30087c08a7a17432510d4c4cb 100644 (file)
--- a/net/knxd/files/knxd.init
+++ b/net/knxd/files/knxd.init
@@ -5,15 +5,29 @@ START=98
 STOP=20
 NAME=knxd
 PROG=/usr/bin/$NAME
+USE_PROCD=1
 
-start() {
-        local options url
-        config_load "$NAME"
-        config_get options args options ''
-        config_get url args url
-        service_start $PROG $options $url
+start_service() {
+       local options url
+       config_load "$NAME"
+       config_get options args options ''
+       config_get url args url
+       procd_open_instance
+       procd_set_param command $PROG $options $url
+       procd_set_param respawn
+       procd_close_instance
 }
 
-stop() {
-        service_stop $PROG
+stop_service() {
+       killall knxd
+}
+
+reload_service()
+{
+       restart
+}
+
+service_triggers()
+{
+       procd_add_reload_trigger knxd
 }