Received-SPF: pass (google.com: domain of linux-nfs-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <0e186d74-b59e-afdb-5ecc-a3fcd1d92cd1@redhat.com>
Date:   Mon, 27 Jun 2022 10:34:46 -0400
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.10.0
Subject: Re: [PATCH nfs-utils] modprobe: protect against sysctl errors
Content-Language: en-US
To:     NeilBrown <neilb@suse.de>
Cc:     linux-nfs <linux-nfs@vger.kernel.org>
References: <165594885936.4786.14207888490098319610@noble.neil.brown.name>
From:   Steve Dickson <steved@redhat.com>
In-Reply-To: <165594885936.4786.14207888490098319610@noble.neil.brown.name>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk


On 6/22/22 9:47 PM, NeilBrown wrote:
> 
> If there is an error running sysctl, a modprobe of these modules will
> fail.  We probably don't want that - missing a sysctl is unlikely to be
> fatal.
> 
> A real possibility is that /sbin/sysctl might not exist at all,
> such as in a initramfs.  In that case we definitely don't want modprobe
> to fail.
> 
> So make the scriptlets safe.
> 
> Signed-off-by: NeilBrown <neilb@suse.de>
Committed... (tag: nfs-utils-2-6-2-rc8)

steved.
> ---
>   systemd/50-nfs.conf | 10 +++++-----
>   1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/systemd/50-nfs.conf b/systemd/50-nfs.conf
> index b56b2d765969..19e8ee734c8e 100644
> --- 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 -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 -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 -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 -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 -q --pattern fs.nfs --system; exit 0; }