Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package nfs-utils for openSUSE:Factory
checked in at 2022-07-12 11:11:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/nfs-utils (Old)
and /work/SRC/openSUSE:Factory/.nfs-utils.new.1523 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "nfs-utils"
Tue Jul 12 11:11:53 2022 rev:172 rq:988230 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/nfs-utils/nfs-utils.changes 2022-06-10
15:57:24.872811873 +0200
+++ /work/SRC/openSUSE:Factory/.nfs-utils.new.1523/nfs-utils.changes
2022-07-12 11:11:54.815657154 +0200
@@ -1,0 +2,9 @@
+Mon Jul 11 03:31:08 UTC 2022 - Neil Brown <nfbr...@suse.com>
+
+- 0004-modprobe-protect-against-sysctl-errors.patch
+ 0005-modprobe-avoid-error-messages-if-sbin-sysctl-fail.patch
+ Suppress any errors from /sbin/sysctl, if for example, it isn't
+ installed
+ (bsc#1200710)
+
+-------------------------------------------------------------------
New:
----
0004-modprobe-protect-against-sysctl-errors.patch
0005-modprobe-avoid-error-messages-if-sbin-sysctl-fail.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ nfs-utils.spec ++++++
--- /var/tmp/diff_new_pack.SF7DzL/_old 2022-07-12 11:11:56.227659002 +0200
+++ /var/tmp/diff_new_pack.SF7DzL/_new 2022-07-12 11:11:56.231659007 +0200
@@ -46,6 +46,8 @@
Patch2: 0001-systemd-Apply-all-sysctl-settings-when-NFS-related-m.patch
Patch3: 0002-Update-autoconfig-files-to-work-with-v2.71.patch
Patch4: 0003-autoconf-change-tirpc-to-check-for-a-file-not-for-an.patch
+Patch5: 0004-modprobe-protect-against-sysctl-errors.patch
+Patch6: 0005-modprobe-avoid-error-messages-if-sbin-sysctl-fail.patch
BuildRequires: e2fsprogs-devel
BuildRequires: gcc-c++
BuildRequires: libtool
++++++ 0004-modprobe-protect-against-sysctl-errors.patch ++++++
>From 5e60e38aa4ba251ef66610514be5f45c41519e0f Mon Sep 17 00:00:00 2001
From: NeilBrown <ne...@suse.de>
Date: Mon, 27 Jun 2022 10:27:06 -0400
Subject: [PATCH] modprobe: protect against sysctl errors
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 <ne...@suse.de>
Signed-off-by: Steve Dickson <ste...@redhat.com>
---
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 -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; }
++++++ 0005-modprobe-avoid-error-messages-if-sbin-sysctl-fail.patch ++++++
>From 040fc30d6d7684526c1556f20bc6bfec6b1c82ed Mon Sep 17 00:00:00 2001
From: NeilBrown <ne...@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.
So hide any such error message - send it to /dev/null
Signed-off-by: NeilBrown <ne...@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; exit 0; }
+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; exit 0; }
+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; exit 0; }
+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; exit 0; }
+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; exit 0; }
+install nfs /sbin/modprobe --ignore-install nfs $CMDLINE_OPTS && {
/sbin/sysctl 2> /dev/null -q --pattern fs.nfs --system; exit 0; }
