gnunet: improve procd init-script

Directly call /usr/lib/gnunet/libexec/gnunet-service-arm instead
of /usr/bin/gnunet-arm, so it remains attached to procd.

Signed-off-by: Daniel Golle <redacted>

diff --git a/net/gnunet/Makefile b/net/gnunet/Makefile
index 58808c0f984a80556ce0860474cc59e8ab499d75..0dba1aefce1456d618f0bfe361bb9c9775a9876f 100644 (file)
--- a/net/gnunet/Makefile
+++ b/net/gnunet/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=gnunet
 PKG_SOURCE_VERSION:=35845
 PKG_VERSION:=0.10.1-svn$(PKG_SOURCE_VERSION)
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 # ToDo:
 #  - split into small packages

diff --git a/net/gnunet/files/gnunet.init b/net/gnunet/files/gnunet.init
index baecd94899454b162adf2fdfaab22ec59e54cabf..04b4067712269cf71e009fbc842fd459a8de963d 100644 (file)
--- a/net/gnunet/files/gnunet.init
+++ b/net/gnunet/files/gnunet.init
@@ -5,7 +5,7 @@ START=50
 STOP=10
 
 USE_PROCD=1
-PROG=/usr/bin/gnunet-arm
+PROG=/usr/lib/gnunet/libexec/gnunet-service-arm
 CONFIGFILE=/var/run/gnunet/gnunet.conf
 
 start_service() {
@@ -19,14 +19,7 @@ start_service() {
        fi
        procd_open_instance
        procd_set_param user gnunet
-       procd_set_param command $PROG -c $CONFIGFILE -s -m
+       procd_set_param command $PROG -c $CONFIGFILE
        procd_set_param respawn
        procd_close_instance
 }
-
-stop_service() {
-       procd_open_instance
-       procd_set_param user gnunet
-       procd_set_param command $PROG -c $CONFIGFILE -e
-       procd_close_instance
-}