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

Merge pull request #10810 from tru7/knxd

Browse source 
knxd: adjust startup files to better comply with procd
This commit is contained in:
Rosen Penev 2019-12-17 12:59:46 -08:00 committed by GitHub
commit 7b54bf9b40
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
net/knxd/Makefile
View file

@ -12,7 +12,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=knxd PKG_NAME:=knxd
PKG_VERSION:=0.14.29 PKG_VERSION:=0.14.29
PKG_RELEASE:=3 PKG_RELEASE:=4
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/knxd/knxd/tar.gz/$(PKG_VERSION)? PKG_SOURCE_URL:=https://codeload.github.com/knxd/knxd/tar.gz/$(PKG_VERSION)?

4
net/knxd/files/knxd.config
View file

@ -8,7 +8,9 @@ config daemon args
#enable the EIBnet/IP server to answer discovery and description requests (SEARCH, DESCRIPTION) #enable the EIBnet/IP server to answer discovery and description requests (SEARCH, DESCRIPTION)
option Discovery 1 option Discovery 1
# EIBADDR set our EIB address to EIBADDR (default 0.0.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 # LEVEL set error level
option error 0 option error 0
# PORT listen at TCP port PORT (default 6720) # PORT listen at TCP port PORT (default 6720)

1
net/knxd/files/knxd.ini
View file

@ -7,7 +7,6 @@ driver = ip
name = mcast:knxd name = mcast:knxd
[main] [main]
addr = 0.0.1 addr = 0.0.1
background = true
client-addrs = 0.0.2:10 client-addrs = 0.0.2:10
connections = A.tcp,server,B.ip connections = A.tcp,server,B.ip
[server] [server]

12
net/knxd/files/knxd.init
View file

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