diff options
| author | Salvatore Bonaccorso <carnil@debian.org> | 2022-12-05 15:37:32 -0500 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2022-12-05 15:59:13 -0500 |
| commit | d8d29f851993f67c053d9712e92244b2f53c4f65 (patch) | |
| tree | 21c119cba29afda26a5b9054a5b1e6a45c683b69 | |
| parent | 5bab9cbc9ff3d071f1e297d7bfff70f40ca9e78e (diff) | |
| download | nfs-utils-d8d29f851993f67c053d9712e92244b2f53c4f65.tar.gz | |
Revert "systemd: Apply all sysctl settings when NFS-related modules are loaded"
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>
Signed-off-by: Steve Dickson <steved@redhat.com>
| -rw-r--r-- | systemd/50-nfs.conf | 16 | ||||
| -rw-r--r-- | systemd/Makefile.am | 10 |
2 files changed, 2 insertions, 24 deletions
diff --git a/systemd/50-nfs.conf b/systemd/50-nfs.conf deleted file mode 100644 index b56b2d7..0000000 --- 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 63a50bf..e7f5d81 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/ |