From: Patrick Grimm <redacted>
Date: Fri, 6 Oct 2017 12:12:48 +0000 (+0200)
Subject: knxd: Fix config file location and init script.
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=53caa112be2a1dce87a16f07aa598dce1fe143d3;p=openwrt-packages.git

knxd: Fix config file location and init script.

Signed-off-by: Patrick Grimm <redacted>
---

diff --git a/net/knxd/Makefile b/net/knxd/Makefile
index 76711f3f9..78a45e4d9 100644
--- 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 d3f847555..0af797269 100644
--- 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
 }