commit: 4a8943891a7da4d1b2acd0eafd68918fff72c1e4 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Sat Jun 3 00:44:59 2023 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> 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 <floppym <AT> 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() {
