From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BA0C515808B for ; Fri, 16 Feb 2024 19:33:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E775FE29FA; Fri, 16 Feb 2024 19:33:09 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C67FDE29FA for ; Fri, 16 Feb 2024 19:33:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A612333FE60 for ; Fri, 16 Feb 2024 19:33:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 15CE61239 for ; Fri, 16 Feb 2024 19:33:07 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1708111969.7aa183ae8073593cab6d3f012a981a6e6712ffc2.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-fs/nfs-utils/files/, net-fs/nfs-utils/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-fs/nfs-utils/files/nfs.initd net-fs/nfs-utils/nfs-utils-2.6.3-r2.ebuild net-fs/nfs-utils/nfs-utils-2.6.3-r3.ebuild net-fs/nfs-utils/nfs-utils-2.6.4-r1.ebuild net-fs/nfs-utils/nfs-utils-2.6.4-r10.ebuild net-fs/nfs-utils/nfs-utils-2.6.4-r3.ebuild net-fs/nfs-utils/nfs-utils-2.6.4-r4.ebuild X-VCS-Directories: net-fs/nfs-utils/ net-fs/nfs-utils/files/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 7aa183ae8073593cab6d3f012a981a6e6712ffc2 X-VCS-Branch: master Date: Fri, 16 Feb 2024 19:33:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c529681a-30f3-457f-a3e0-3983b99c6418 X-Archives-Hash: 992ad044136bfb215fd01ce390e3813a commit: 7aa183ae8073593cab6d3f012a981a6e6712ffc2 Author: Mike Gilbert gentoo org> AuthorDate: Fri Feb 16 19:23:48 2024 +0000 Commit: Mike Gilbert gentoo 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 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