summaryrefslogtreecommitdiff
path: root/net-fs
diff options
context:
space:
mode:
authorGeorgy Yakovlev <gyakovlev@gentoo.org>2023-01-19 09:51:46 -0800
committerGeorgy Yakovlev <gyakovlev@gentoo.org>2023-01-19 09:55:32 -0800
commit17932f0fd7e8dc001c6fc26c084f1a2ea6672a16 (patch)
treef780427e3a739d94af7f3981711c3465175e7f74 /net-fs
parentdev-python/pandas: Bump to 1.5.3 (diff)
downloadgentoo-17932f0fd7e8dc001c6fc26c084f1a2ea6672a16.tar.gz
gentoo-17932f0fd7e8dc001c6fc26c084f1a2ea6672a16.tar.bz2
gentoo-17932f0fd7e8dc001c6fc26c084f1a2ea6672a16.zip
net-fs/ksmbd-tools: revbump 3.4.6, improve openrc startup/reload
* don't check for modprobe errors, some systems may have specific configuration where modprobe returns errors #891129 * add reload() openrc subcommand to initscript. * allow passing arbitrary KSMBD_OPTS for ksmbd.mountd(8) * remove incorrect mountd opts. Thanks-to: Pedro de Oliveira <falsovsky@gmail.com> Closes: https://bugs.gentoo.org/891129 Signed-off-by: Georgy Yakovlev <gyakovlev@gentoo.org>
Diffstat (limited to 'net-fs')
-rw-r--r--net-fs/ksmbd-tools/files/ksmbd.confd3
-rw-r--r--net-fs/ksmbd-tools/files/ksmbd.initd15
-rw-r--r--net-fs/ksmbd-tools/ksmbd-tools-3.4.6-r1.ebuild (renamed from net-fs/ksmbd-tools/ksmbd-tools-3.4.6.ebuild)0
3 files changed, 15 insertions, 3 deletions
diff --git a/net-fs/ksmbd-tools/files/ksmbd.confd b/net-fs/ksmbd-tools/files/ksmbd.confd
index cfe0fde01819..cc014a04559d 100644
--- a/net-fs/ksmbd-tools/files/ksmbd.confd
+++ b/net-fs/ksmbd-tools/files/ksmbd.confd
@@ -3,3 +3,6 @@
# Full path to config file. /etc/ksmbd/ksmbd.conf is default if not set.
#KSMBD_CONF="/etc/ksmbd/ksmbd.conf"
+
+# Extra options to pass to ksmbd.mountd(8) at startup
+#KSMBD_OPTS=""
diff --git a/net-fs/ksmbd-tools/files/ksmbd.initd b/net-fs/ksmbd-tools/files/ksmbd.initd
index 744125c642dd..86feb90b8da1 100644
--- a/net-fs/ksmbd-tools/files/ksmbd.initd
+++ b/net-fs/ksmbd-tools/files/ksmbd.initd
@@ -3,6 +3,7 @@
# Distributed under the terms of the GNU General Public License v2
KSMBD_CONF="${KSMBD_CONF:-/etc/ksmbd/ksmbd.conf}"
+KSMBD_OPTS="${KSMBD_OPTS:-}"
depend() {
need localmount
@@ -13,17 +14,25 @@ description="ksmbd userspace daemon"
command="/sbin/ksmbd.mountd"
command_control="/sbin/ksmbd.control"
-command_args="-s"
+command_args="--config=${KSMBD_CONF} ${KSMBD_OPTS}"
+
+extra_started_commands="reload"
required_files="${KSMBD_CONF}"
+reload() {
+ ebegin "Reloading ${RC_SVCNAME}"
+ "${command_control}" --reload
+ eend $?
+}
+
start_pre() {
- /sbin/modprobe ksmbd || return 1
+ /sbin/modprobe -q ksmbd || return 0
}
stop() {
ebegin "Stopping ${RC_SVCNAME}"
- "${command_control}" -s
+ "${command_control}" --shutdown
eend $?
}
diff --git a/net-fs/ksmbd-tools/ksmbd-tools-3.4.6.ebuild b/net-fs/ksmbd-tools/ksmbd-tools-3.4.6-r1.ebuild
index 3cc23c1bbc48..3cc23c1bbc48 100644
--- a/net-fs/ksmbd-tools/ksmbd-tools-3.4.6.ebuild
+++ b/net-fs/ksmbd-tools/ksmbd-tools-3.4.6-r1.ebuild