Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

syncthing: fix wrong group name in syncthing.init

Browse source 
The group does not always have the same name as user, and when I try
to run syncthing with nobody I get an error. Since nobody belongs to
the group nogroup, I added some code to find out which group user
belongs to.

Signed-off-by: Xiang W <wxjstz@126.com>
This commit is contained in:
Xiang W 2023-12-19 13:20:13 +00:00 committed by Rosen Penev
parent f74b43709a
commit ed41a9d850
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
utils/syncthing/Makefile
View file

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=syncthing PKG_NAME:=syncthing
PKG_VERSION:=1.27.1 PKG_VERSION:=1.27.1
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=syncthing-source-v$(PKG_VERSION).tar.gz PKG_SOURCE:=syncthing-source-v$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://github.com/syncthing/syncthing/releases/download/v$(PKG_VERSION) PKG_SOURCE_URL:=https://github.com/syncthing/syncthing/releases/download/v$(PKG_VERSION)

6
utils/syncthing/files/syncthing.init
View file

@ -55,6 +55,8 @@ start_service() {
config_load "syncthing" config_load "syncthing"
local group=$(id -gn $user)
# Some of the default values below might not match the defaults # Some of the default values below might not match the defaults
# in /etc/config/syncthing: the reason is to remain backwards # in /etc/config/syncthing: the reason is to remain backwards
# compatible with the older versions of this service as it # compatible with the older versions of this service as it
@ -67,12 +69,12 @@ start_service() {
[ -d "$IDX_DB" ] || mkdir -p "$IDX_DB" [ -d "$IDX_DB" ] || mkdir -p "$IDX_DB"
# A separate step to handle an upgrade use case # A separate step to handle an upgrade use case
[ -d "$IDX_DB" ] && chown -R $user:$user "$IDX_DB" [ -d "$IDX_DB" ] && chown -R $user:$group "$IDX_DB"
fi fi
[ -d "$home" ] || mkdir -p "$home" [ -d "$home" ] || mkdir -p "$home"
# A separate step to handle an upgrade use case # A separate step to handle an upgrade use case
[ -d "$home" ] && chown -R $user:$user "$home" [ -d "$home" ] && chown -R $user:$group "$home"
# Changes to "niceness"/macprocs are not picked up by "reload_config" # Changes to "niceness"/macprocs are not picked up by "reload_config"
# nor by "restart": the service has to be stopped/started # nor by "restart": the service has to be stopped/started