File 0026-modprobe-avoid-error-messages-if-sbin-sysc... of Package nfs-utils

Overview Repositories Revisions Requests Users Attributes Meta

File 0026-modprobe-avoid-error-messages-if-sbin-sysctl-fail.patch of Package nfs-utils (Revision c64b09a55da60b0f9f76b843fedffc8a)

Currently displaying revision c64b09a55da60b0f9f76b843fedffc8a , Show latest

From 91313050e33dec90c6042123a75a480b240f3065 Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Mon, 11 Jul 2022 13:25:38 +1000
Subject: [PATCH] modprobe: avoid error messages if /sbin/sysctl fail

If /sbin/sysctl fails, for example if it is not installed, then the
install line does not fail but we can still get an error message in the
logs, which could be annoying.  modprobe can also see a failure from the
"install" line.

So hide any such error message - send it to /dev/null, and ensure we
exit with 0 if the "modprobe --ignore-install" succeeds.

Signed-off-by: NeilBrown <neilb@suse.de>
---
 systemd/50-nfs.conf |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- a/systemd/50-nfs.conf
+++ b/systemd/50-nfs.conf
@@ -1,16 +1,16 @@
 # 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
+install sunrpc /sbin/modprobe --ignore-install sunrpc $CMDLINE_OPTS && { /sbin/sysctl 2> /dev/null -q --pattern sunrpc --system ; exit 0; }
 
 # rpcrdma module supports sunrpc.svc_rdma.*
-install rpcrdma /sbin/modprobe --ignore-install rpcrdma $CMDLINE_OPTS && /sbin/sysctl -q --pattern sunrpc.svc_rdma --system
+install rpcrdma /sbin/modprobe --ignore-install rpcrdma $CMDLINE_OPTS && { /sbin/sysctl 2> /dev/null -q --pattern sunrpc.svc_rdma --system ; exit 0; }
 
 # 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
+install lockd /sbin/modprobe --ignore-install lockd $CMDLINE_OPTS && { /sbin/sysctl 2> /dev/null -q --pattern fs.nfs.n[sl]m --system ; exit 0; }
 
 # 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
+install nfsv4 /sbin/modprobe --ignore-install nfsv4 $CMDLINE_OPTS && { /sbin/sysctl 2> /dev/null -q --pattern 'fs.nfs.(nfs_callback_tcpport|idmap_cache_timeout)' --system ; exit 0; }
 
 # nfs module supports "fs.nfs.*" sysctls
-install nfs /sbin/modprobe --ignore-install nfs $CMDLINE_OPTS && /sbin/sysctl -q --pattern fs.nfs --system
+install nfs /sbin/modprobe --ignore-install nfs $CMDLINE_OPTS && { /sbin/sysctl 2> /dev/null -q --pattern fs.nfs --system ; exit 0; }

Places

File 0026-modprobe-avoid-error-messages-if-sbin-sysctl-fail.patch of Package nfs-utils (Revision c64b09a55da60b0f9f76b843fedffc8a)

Places