From: Salvatore Bonaccorso <carnil@debian.org>
To: NeilBrown <neilb@suse.de>, Steve Dickson <steved@redhat.com>,
linux-nfs@vger.kernel.org
Cc: Andras Korn <korn-debbugs@elan.rulez.org>,
Marco d'Itri <md@linux.it>, Michael Prokop <mika@debian.org>,
Salvatore Bonaccorso <carnil@debian.org>
Subject: [PATCH 3/4] Revert "systemd: Apply all sysctl settings when NFS-related modules are loaded"
Date: Fri, 25 Nov 2022 14:07:24 +0100 [thread overview]
Message-ID: <20221125130725.1977606-4-carnil@debian.org> (raw)
In-Reply-To: <20221125130725.1977606-1-carnil@debian.org>
This reverts commit afc7132dfb212ac1f676a5ac36d29a9e06325645.
The approach caused problems with sysctl from busybox and with kmod as
reported in Debian (https://bugs.debian.org/1024082).
Signed-off-by: Salvatore Bonaccorso <carnil@debian.org>
---
systemd/50-nfs.conf | 16 ----------------
systemd/Makefile.am | 10 ++--------
2 files changed, 2 insertions(+), 24 deletions(-)
delete mode 100644 systemd/50-nfs.conf
diff --git a/systemd/50-nfs.conf b/systemd/50-nfs.conf
deleted file mode 100644
index b56b2d765969..000000000000
--- a/systemd/50-nfs.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-# Ensure all NFS systctl settings get applied when modules load
-
-# sunrpc module supports "sunrpc.*" sysctls
-install sunrpc /sbin/modprobe --ignore-install sunrpc $CMDLINE_OPTS && /sbin/sysctl -q --pattern sunrpc --system
-
-# rpcrdma module supports sunrpc.svc_rdma.*
-install rpcrdma /sbin/modprobe --ignore-install rpcrdma $CMDLINE_OPTS && /sbin/sysctl -q --pattern sunrpc.svc_rdma --system
-
-# lockd module supports "fs.nfs.nlm*" and "fs.nfs.nsm*" sysctls
-install lockd /sbin/modprobe --ignore-install lockd $CMDLINE_OPTS && /sbin/sysctl -q --pattern fs.nfs.n[sl]m --system
-
-# nfsv4 module supports "fs.nfs.*" sysctls (nfs_callback_tcpport and idmap_cache_timeout)
-install nfsv4 /sbin/modprobe --ignore-install nfsv4 $CMDLINE_OPTS && /sbin/sysctl -q --pattern 'fs.nfs.(nfs_callback_tcpport|idmap_cache_timeout)' --system
-
-# nfs module supports "fs.nfs.*" sysctls
-install nfs /sbin/modprobe --ignore-install nfs $CMDLINE_OPTS && /sbin/sysctl -q --pattern fs.nfs --system
diff --git a/systemd/Makefile.am b/systemd/Makefile.am
index 63a50bf2c07e..e7f5d818a913 100644
--- a/systemd/Makefile.am
+++ b/systemd/Makefile.am
@@ -2,8 +2,6 @@
MAINTAINERCLEANFILES = Makefile.in
-modprobe_files = 50-nfs.conf
-
unit_files = \
nfs-client.target \
rpc_pipefs.target \
@@ -53,7 +51,7 @@ endif
man5_MANS = nfs.conf.man
man7_MANS = nfs.systemd.man
-EXTRA_DIST = $(unit_files) $(modprobe_files) $(man5_MANS) $(man7_MANS)
+EXTRA_DIST = $(unit_files) $(man5_MANS) $(man7_MANS)
generator_dir = $(unitdir)/../system-generators
@@ -75,12 +73,8 @@ rpc_pipefs_generator_LDADD = ../support/nfs/libnfs.la
if INSTALL_SYSTEMD
genexec_PROGRAMS = nfs-server-generator rpc-pipefs-generator
-install-data-hook: $(unit_files) $(modprobe_files)
+install-data-hook: $(unit_files)
mkdir -p $(DESTDIR)/$(unitdir)
cp $(unit_files) $(DESTDIR)/$(unitdir)
cp $(rpc_pipefs_mount_file) $(DESTDIR)/$(unitdir)/$(rpc_pipefsmount)
-else
-install-data-hook: $(modprobe_files)
endif
- mkdir -p $(DESTDIR)/usr/lib/modprobe.d
- cp $(modprobe_files) $(DESTDIR)/usr/lib/modprobe.d/
--
2.38.1
next prev parent reply other threads:[~2022-11-25 13:08 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-25 13:07 [PATCH 0/4] Replace sysctl setting invocations triggered from udev rule instead of modprobe configuration Salvatore Bonaccorso
2022-11-25 13:07 ` [PATCH 1/4] Revert "configure: make modprobe.d directory configurable." Salvatore Bonaccorso
2022-11-25 13:07 ` [PATCH 2/4] Revert "modprobe: protect against sysctl errors" Salvatore Bonaccorso
2022-11-25 13:07 ` Salvatore Bonaccorso [this message]
2022-11-25 13:07 ` [PATCH 4/4] systemd: Apply all sysctl settings through udev rule when NFS-related modules are loaded Salvatore Bonaccorso
2022-11-25 13:29 ` Michael Prokop
2022-11-25 16:21 ` Salvatore Bonaccorso
2022-11-25 16:27 ` Michael Prokop
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221125130725.1977606-4-carnil@debian.org \
--to=carnil@debian.org \
--cc=korn-debbugs@elan.rulez.org \
--cc=linux-nfs@vger.kernel.org \
--cc=md@linux.it \
--cc=mika@debian.org \
--cc=neilb@suse.de \
--cc=steved@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.