From a7d3b91ce98e1a2ea903eb907093fa6a276a45eb Mon Sep 17 00:00:00 2001 From: Marc Benoit Date: Sun, 1 Mar 2020 12:30:06 -0500 Subject: [PATCH] syncthing: enable via config, lower priority, cleanup Added the ability to enable/disable via a config file; the default is enabled for backwards compatibility. This is an additional service, so running it the same priority as dnsmasq, etc does not make sense. Added USE_PROCD=1 "done" starts at "START=95", so this should start earlier Added STOP=10 to stop syncthing early Compile-tested on: ipq806x, ipq40xx Runtime-tested on: ipq806x, ipq40xx Signed-off-by: Marc Benoit (cherry picked from commit 6f6877460a775a75f16154f2d75944bf91770f0d) --- utils/syncthing/Makefile | 2 +- utils/syncthing/files/etc/config/syncthing | 8 ++++++-- utils/syncthing/files/etc/init.d/syncthing | 15 +++++++++++++-- 3 files changed, 20 insertions(+), 5 deletions(-) diff --git a/utils/syncthing/Makefile b/utils/syncthing/Makefile index 78474964fa..f55f511d98 100644 --- a/utils/syncthing/Makefile +++ b/utils/syncthing/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=syncthing PKG_VERSION:=1.3.4 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=syncthing-source-v$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/syncthing/syncthing/releases/download/v$(PKG_VERSION) diff --git a/utils/syncthing/files/etc/config/syncthing b/utils/syncthing/files/etc/config/syncthing index 9c17b68a55..427c8c5b12 100644 --- a/utils/syncthing/files/etc/config/syncthing +++ b/utils/syncthing/files/etc/config/syncthing @@ -1,3 +1,7 @@ + config syncthing 'syncthing' - option gui_address 'http://127.0.0.1:8384' - option home '/etc/syncthing/' + option enabled '0' + + option gui_address 'http://127.0.0.1:8384' + option home '/etc/syncthing/' + diff --git a/utils/syncthing/files/etc/init.d/syncthing b/utils/syncthing/files/etc/init.d/syncthing index 1740351adc..443ef4f359 100755 --- a/utils/syncthing/files/etc/init.d/syncthing +++ b/utils/syncthing/files/etc/init.d/syncthing @@ -1,14 +1,24 @@ #!/bin/sh /etc/rc.common -START=99 +START=90 +STOP=10 + +USE_PROCD=1 +NICEPRIO=19 PROG=/usr/bin/syncthing start_service() { [ -d /var/syncthing/ ] || mkdir /var/syncthing/ - local gui_address home + local gui_address home enabled config_load "syncthing" + + # The first version had the service enabled by default, + # so preserving the old behaviour + config_get_bool enabled syncthing enabled 1 + [ "$enabled" -gt 0 ] || return 0 + config_get gui_address syncthing gui_address "http://127.0.0.1:8384" config_get home syncthing home "/etc/syncthing/" @@ -17,5 +27,6 @@ start_service() { procd_append_param command -gui-address="$gui_address" procd_append_param command -home="$home" procd_set_param respawn + procd_set_param nice "$NICEPRIO" procd_close_instance } -- 2.30.2