knxd: adjust startup files to better comply with procd

Signed-off-by: Othmar Truniger <github@truniger.ch>

diff --git a/net/knxd/Makefile b/net/knxd/Makefile
index a10236e200b912da7d48c34f50afbe85e423094a..9d7c8818ebd10f657a9d40ef406e7bd950f61e32 100644 (file)
--- a/net/knxd/Makefile
+++ b/net/knxd/Makefile
@@ -12,7 +12,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=knxd
 PKG_VERSION:=0.14.29
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/knxd/knxd/tar.gz/$(PKG_VERSION)?

diff --git a/net/knxd/files/knxd.config b/net/knxd/files/knxd.config
index 81dacaabd6c6c374ffa634aaaebe33d4c99225d0..b4cfa4e3d418939acb6d690dc80fa77e1333ccc9 100644 (file)
--- a/net/knxd/files/knxd.config
+++ b/net/knxd/files/knxd.config
@@ -8,7 +8,9 @@ config daemon args
        #enable the EIBnet/IP server to answer discovery and description requests (SEARCH, DESCRIPTION)
        option Discovery 1
        # EIBADDR set our EIB address to EIBADDR (default 0.0.1)
-       option eibaddr "0.0.2"
+       option eibaddr "0.0.1"
+       # CLIENTADDRS set client addrs
+       option client_addrs "0.0.2:10"
        # LEVEL set error level
        option error 0
        # PORT listen at TCP port PORT (default 6720)

diff --git a/net/knxd/files/knxd.ini b/net/knxd/files/knxd.ini
index b4193dd5fa9024062452ef57e5ed4239bbecf0ed..b676e1c075c004c0ffbfe3a8a05d542669263333 100644 (file)
--- a/net/knxd/files/knxd.ini
+++ b/net/knxd/files/knxd.ini
@@ -7,7 +7,6 @@ driver = ip
 name = mcast:knxd
 [main]
 addr = 0.0.1
-background = true
 client-addrs = 0.0.2:10
 connections = A.tcp,server,B.ip
 [server]

diff --git a/net/knxd/files/knxd.init b/net/knxd/files/knxd.init
index 7eafebbb77de237dcc28108063c48c4d0a0958de..5179cf45636dd15744016644628219d594d854e6 100644 (file)
--- a/net/knxd/files/knxd.init
+++ b/net/knxd/files/knxd.init
@@ -36,7 +36,7 @@ start_service() {
        append_parm args client_addrs "client-addrs" "0.0.2:10"
        append_parm args layer2 "layer2"
        append_bool args GroupCache "GroupCache" 0
-       append_parm args daemon "daemon" "/var/log/knxd.log"
+       #append_parm args daemon "daemon" "/var/log/knxd.log"
        append_parm args error "error" # "5"
        append_parm args listen_tcp "listen-tcp" "6720"
        append_parm args Interface "Interface" # "eth0"
@@ -56,18 +56,16 @@ start_service() {
        if [ "$url" == "usb:" ] ; then
                url="usb:""$(findknxusb | tail -n1 | sed -e 's/device: \([0-9]:[0-9]:[0-9]\):[0-9].*/\1/')"
        fi
-       echo "/usr/lib/knxd_args $params $url"
-       /usr/lib/knxd_args $params $url > /tmp/etc/knxd.ini
+       echo "/usr/lib/knxd_args $params -b $url"
+       /usr/lib/knxd_args $params -b $url > /tmp/etc/knxd.ini
        procd_open_instance
        procd_set_param command $PROG "/tmp/etc/knxd.ini"
        procd_set_param respawn
+       procd_set_param stdout 1
+       procd_set_param stderr 1
        procd_close_instance
 }
 
-stop_service() {
-       killall knxd
-}
-
 reload_service()
 {
        restart