From 5e086da6083889a55cb7b0bbd078ab12cd17ab7a Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Thu, 8 Mar 2018 21:46:05 +0100
Subject: [PATCH] gluon-respondd: remove Gluon-specific provider directory
Our provider modules are prefixed with gluon- now, and the log message
about a missing provider dir was confusing users.
---
package/gluon-respondd/files/etc/init.d/gluon-respondd | 2 +-
package/gluon.mk | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package/gluon-respondd/files/etc/init.d/gluon-respondd b/package/gluon-respondd/files/etc/init.d/gluon-respondd
index 2af796874..ca07fa90e 100755
--- a/package/gluon-respondd/files/etc/init.d/gluon-respondd
+++ b/package/gluon-respondd/files/etc/init.d/gluon-respondd
@@ -13,7 +13,7 @@ start_service() {
local clientdevs=$(for dev in $(echo "$ifdump" | jsonfilter -e "@.interface[@.interface='$(cat /lib/gluon/respondd/client.dev 2>/dev/null)' && @.up=true].device"); do echo " -i $dev -t $MAXDELAY";done;)
procd_open_instance
- procd_set_param command $DAEMON -d /usr/lib/respondd -d /lib/gluon/respondd -p 1001 -g ff02::2:1001 $meshdevs $clientdevs -g ff05::2:1001 $clientdevs
+ procd_set_param command $DAEMON -d /usr/lib/respondd -p 1001 -g ff02::2:1001 $meshdevs $clientdevs -g ff05::2:1001 $clientdevs
procd_set_param respawn ${respawn_threshold:-3600} ${respawn_timeout:-5} ${respawn_retry:-5}
procd_set_param stderr 1
procd_close_instance
diff --git a/package/gluon.mk b/package/gluon.mk
index cd2783f85..1e2cb5a59 100644
--- a/package/gluon.mk
+++ b/package/gluon.mk
@@ -92,8 +92,8 @@ define Gluon/Build/Install
$(CP) $(PKG_BUILD_DIR)/luadest/. $(1)/
)
$(if $(wildcard ./src/respondd.c),
- $(INSTALL_DIR) $(1)/lib/gluon/respondd
- $(CP) $(PKG_BUILD_DIR)/respondd.so $(1)/lib/gluon/respondd/$(PKG_NAME).so
+ $(INSTALL_DIR) $(1)/usr/lib/respondd
+ $(CP) $(PKG_BUILD_DIR)/respondd.so $(1)/usr/lib/respondd/$(PKG_NAME).so
)
$(if $(wildcard ./i18n/.),
$(GluonInstallI18N)
--
GitLab