commit: 7aa183ae8073593cab6d3f012a981a6e6712ffc2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Fri Feb 16 19:23:48 2024 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Fri Feb 16 19:32:49 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7aa183ae
net-fs/nfs-utils: stop sending signals to kernel nfsd threads Closes: https://bugs.gentoo.org/924309 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> net-fs/nfs-utils/files/nfs.initd | 10 ++++------ .../{nfs-utils-2.6.3-r2.ebuild => nfs-utils-2.6.3-r3.ebuild} | 2 +- .../{nfs-utils-2.6.4-r3.ebuild => nfs-utils-2.6.4-r10.ebuild} | 0 .../{nfs-utils-2.6.4-r1.ebuild => nfs-utils-2.6.4-r4.ebuild} | 0 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/net-fs/nfs-utils/files/nfs.initd b/net-fs/nfs-utils/files/nfs.initd index 6540c9f92075..bc548f027c07 100644 --- a/net-fs/nfs-utils/files/nfs.initd +++ b/net-fs/nfs-utils/files/nfs.initd @@ -6,8 +6,8 @@ extra_started_commands="reload" # The binary locations exportfs=/usr/sbin/exportfs - mountd=/usr/sbin/rpc.mountd - nfsd=/usr/sbin/rpc.nfsd +mountd=/usr/sbin/rpc.mountd +nfsd=/usr/sbin/rpc.nfsd smnotify=/usr/sbin/sm-notify depend() { @@ -106,13 +106,11 @@ stop() { eend $? ret=$((ret + $?)) - # nfsd sets its process name to [nfsd] so don't look for $nfsd ebegin "Stopping NFS daemon" - start-stop-daemon --stop --name nfsd --user root --signal 2 + # Do not attempt to signal kernel nfsd threads directly, #924309 + ${nfsd} 0 eend $? ret=$((ret + $?)) - # in case things don't work out ... #228127 - rpc.nfsd 0 # When restarting the NFS server, running "exportfs -ua" probably # isn't what the user wants. Running it causes all entries listed diff --git a/net-fs/nfs-utils/nfs-utils-2.6.3-r2.ebuild b/net-fs/nfs-utils/nfs-utils-2.6.3-r3.ebuild similarity index 99% rename from net-fs/nfs-utils/nfs-utils-2.6.3-r2.ebuild rename to net-fs/nfs-utils/nfs-utils-2.6.3-r3.ebuild index 93a79d1a257b..773a752231a3 100644 --- a/net-fs/nfs-utils/nfs-utils-2.6.3-r2.ebuild +++ b/net-fs/nfs-utils/nfs-utils-2.6.3-r3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/net-fs/nfs-utils/nfs-utils-2.6.4-r3.ebuild b/net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild similarity index 100% rename from net-fs/nfs-utils/nfs-utils-2.6.4-r3.ebuild rename to net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild diff --git a/net-fs/nfs-utils/nfs-utils-2.6.4-r1.ebuild b/net-fs/nfs-utils/nfs-utils-2.6.4-r4.ebuild similarity index 100% rename from net-fs/nfs-utils/nfs-utils-2.6.4-r1.ebuild rename to net-fs/nfs-utils/nfs-utils-2.6.4-r4.ebuild
