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 2361F15806E for ; Sat, 3 Jun 2023 00:47:21 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 30A6EE08A5; Sat, 3 Jun 2023 00:47:20 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 16961E08A5 for ; Sat, 3 Jun 2023 00:47:20 +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 275A9340EE0 for ; Sat, 3 Jun 2023 00:47:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 47B0FA5A for ; Sat, 3 Jun 2023 00:47:17 +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: <1685753099.4a8943891a7da4d1b2acd0eafd68918fff72c1e4.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-utils-udev-sysctl.patch net-fs/nfs-utils/nfs-utils-2.6.3-r1.ebuild net-fs/nfs-utils/nfs-utils-2.6.3-r2.ebuild X-VCS-Directories: net-fs/nfs-utils/files/ net-fs/nfs-utils/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 4a8943891a7da4d1b2acd0eafd68918fff72c1e4 X-VCS-Branch: master Date: Sat, 3 Jun 2023 00:47:17 +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: c833eacc-715c-4701-a4be-29741c3bdb2a X-Archives-Hash: b97127c6c6f1c2a1e8e8e62769117acc commit: 4a8943891a7da4d1b2acd0eafd68918fff72c1e4 Author: Mike Gilbert gentoo org> AuthorDate: Sat Jun 3 00:44:59 2023 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Sat Jun 3 00:44:59 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a894389 net-fs/nfs-utils: fix path to sysctl in udev rules Closes: https://bugs.gentoo.org/907688 Signed-off-by: Mike Gilbert gentoo.org> net-fs/nfs-utils/files/nfs-utils-udev-sysctl.patch | 32 ++++++++++++++++++++++ ...s-2.6.3-r1.ebuild => nfs-utils-2.6.3-r2.ebuild} | 1 + 2 files changed, 33 insertions(+) diff --git a/net-fs/nfs-utils/files/nfs-utils-udev-sysctl.patch b/net-fs/nfs-utils/files/nfs-utils-udev-sysctl.patch new file mode 100644 index 000000000000..156a3067bb3c --- /dev/null +++ b/net-fs/nfs-utils/files/nfs-utils-udev-sysctl.patch @@ -0,0 +1,32 @@ +Gentoo installs sysctl in /usr/sbin + +https://bugs.gentoo.org/907688 + +--- a/systemd/60-nfs.rules ++++ b/systemd/60-nfs.rules +@@ -2,20 +2,20 @@ + + # sunrpc module supports "sunrpc.*" sysctls + ACTION=="add", SUBSYSTEM=="module", KERNEL=="sunrpc", \ +- RUN+="/sbin/sysctl -q --pattern ^sunrpc --system" ++ RUN+="/usr/sbin/sysctl -q --pattern ^sunrpc --system" + + # rpcrdma module supports sunrpc.svc_rdma.* + ACTION=="add", SUBSYSTEM=="module", KERNEL=="rpcrdma", \ +- RUN+="/sbin/sysctl -q --pattern ^sunrpc.svc_rdma --system" ++ RUN+="/usr/sbin/sysctl -q --pattern ^sunrpc.svc_rdma --system" + + # lockd module supports "fs.nfs.nlm*" and "fs.nfs.nsm*" sysctls + ACTION=="add", SUBSYSTEM=="module", KERNEL=="lockd", \ +- RUN+="/sbin/sysctl -q --pattern ^fs.nfs.n[sl]m --system" ++ RUN+="/usr/sbin/sysctl -q --pattern ^fs.nfs.n[sl]m --system" + + # nfsv4 module supports "fs.nfs.*" sysctls (nfs_callback_tcpport and idmap_cache_timeout) + ACTION=="add", SUBSYSTEM=="module", KERNEL=="nfsv4", \ +- RUN+="/sbin/sysctl -q --pattern ^fs.nfs.(nfs_callback_tcpport|idmap_cache_timeout) --system" ++ RUN+="/usr/sbin/sysctl -q --pattern ^fs.nfs.(nfs_callback_tcpport|idmap_cache_timeout) --system" + + # nfs module supports "fs.nfs.*" sysctls + ACTION=="add", SUBSYSTEM=="module", KERNEL=="nfs", \ +- RUN+="/sbin/sysctl -q --pattern ^fs.nfs --system" ++ RUN+="/usr/sbin/sysctl -q --pattern ^fs.nfs --system" diff --git a/net-fs/nfs-utils/nfs-utils-2.6.3-r1.ebuild b/net-fs/nfs-utils/nfs-utils-2.6.3-r2.ebuild similarity index 99% rename from net-fs/nfs-utils/nfs-utils-2.6.3-r1.ebuild rename to net-fs/nfs-utils/nfs-utils-2.6.3-r2.ebuild index 242fef17126e..b7f3a0e8f9af 100644 --- a/net-fs/nfs-utils/nfs-utils-2.6.3-r1.ebuild +++ b/net-fs/nfs-utils/nfs-utils-2.6.3-r2.ebuild @@ -73,6 +73,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}"/${PN}-2.5.2-no-werror.patch + "${FILESDIR}"/${PN}-udev-sysctl.patch ) pkg_setup() {