knxd: Fix config file location and init script.

Signed-off-by: Patrick Grimm <patrick@lunatiki.de>

diff --git a/net/knxd/Makefile b/net/knxd/Makefile
index 76711f3f9f5c0358350ce3e1d4206aac2ee84651..78a45e4d9eab20f8b88922c53d639bdd69805376 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.18
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/knxd/knxd.git
@@ -47,7 +47,7 @@ EIB KNX Daemon
 endef
 
 define Package/knxd/conffiles
-/etc/config/knxd.ini
+/etc/knxd.ini
 endef
 
 TARGET_CXXFLAGS+= -std=c++0x
@@ -72,7 +72,7 @@ define Package/knxd/install
        $(INSTALL_BIN) ./files/knxd.init $(1)/etc/init.d/knxd
 
        $(INSTALL_DIR) $(1)/etc/config
-       $(INSTALL_DATA) ./files/knxd.ini $(1)/etc/config/knxd.ini
+       $(INSTALL_DATA) ./files/knxd.ini $(1)/etc/knxd.ini
 endef
 
 $(eval $(call BuildPackage,knxd))

diff --git a/net/knxd/files/knxd.init b/net/knxd/files/knxd.init
index d3f8475554b914d1dd8837c6aef9a3c35552fa29..0af797269eec43e7092e7313793a055f9c6eebf2 100644 (file)
--- a/net/knxd/files/knxd.init
+++ b/net/knxd/files/knxd.init
@@ -54,7 +54,7 @@ start_service() {
        append_parm args listen_local "listen-local" "/var/run/knxd"
        config_get url args url
        procd_open_instance
-       procd_set_param command $PROG $params $url
+       procd_set_param command $PROG "/etc/knxd.ini"
        procd_set_param respawn
        procd_close_instance
 }