summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorGeorgi Valkov <gvalkov@abv.bg>2021-11-28 19:22:56 +0200
committerRosen Penev <rosenp@gmail.com>2021-11-29 01:24:09 -0800
commit4af04cdc05af1e78dab310550fae5bae21d51c8c (patch)
tree2778c32fd885f437705e21403bf4814bb7aa7f18 /net
parent06db04ba6375dd42f2858a96cb823ad5834c56bb (diff)
ksmbd-tools: Fix ksmbd service is semi-killed at system startup
The configuration for the ksmbd service is auto-generated when the OpenWRT configuration changes, and also during startup, hence ksmbd.init has to reload the kernel module. It does that by calling kill_server, which does not perform cleanup. This results in ksmbd being killed but not restarted properly during boot. This patch resolves the issue by using stop_service, which performs proper cleanup. https://forum.openwrt.org/t/ksmbd-samba3-4-alternative-ex-cifsd-smbd-package-support-thread/51695/68 Signed-off-by: Georgi Valkov <gvalkov@abv.bg>
Diffstat (limited to 'net')
-rw-r--r--net/ksmbd-tools/Makefile2
-rw-r--r--net/ksmbd-tools/files/ksmbd.init2
2 files changed, 2 insertions, 2 deletions
diff --git a/net/ksmbd-tools/Makefile b/net/ksmbd-tools/Makefile
index 2b137347b..ad74c28e0 100644
--- a/net/ksmbd-tools/Makefile
+++ b/net/ksmbd-tools/Makefile
@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=ksmbd-tools
PKG_VERSION:=3.4.2
-PKG_RELEASE:=1
+PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://codeload.github.com/cifsd-team/ksmbd-tools/tar.gz/$(PKG_VERSION)?
diff --git a/net/ksmbd-tools/files/ksmbd.init b/net/ksmbd-tools/files/ksmbd.init
index 2c296b10b..7c628e826 100644
--- a/net/ksmbd-tools/files/ksmbd.init
+++ b/net/ksmbd-tools/files/ksmbd.init
@@ -151,7 +151,7 @@ start_service()
fi
# NOTE: We don't do a soft-reload via signal, since [global] smb.conf setting changes will be ignored, so always reset hard.
- kill_server
+ [ -e /sys/module/ksmbd ] && stop_service
[ ! -e /sys/module/ksmbd ] && modprobe ksmbd 2> /dev/null
if [ ! -e /sys/module/ksmbd ]; then