Accepting request 1075133 from Base:System

OBS-URL: https://build.opensuse.org/request/show/1075133
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nfs-utils?expand=0&rev=177

0007-mount.nfs-always-include-mountpoint-or-spec-if-error.patch

@@ -0,0 +1,88 @@
+From e6dc15cbe1e0171055765f329d2f2b6a65ea9635 Mon Sep 17 00:00:00 2001
+From: NeilBrown <neilb@suse.de>
+Date: Tue, 28 Mar 2023 13:49:57 +1100
+Subject: [PATCH] mount.nfs: always include mountpoint or spec if error
+ messages.
+
+If you try to mount from a server that is inaccessible you might get an
+error like:
+    mount.nfs: No route to host
+
+This is OK when running "mount" interactively, but hardly useful when
+found in system logs.
+
+This patch changes mount_error() to always included at least one of
+mount_point and spec in any error message.
+
+Signed-off-by: NeilBrown <neilb@suse.de>
+---
+ utils/mount/error.c |   31 ++++++++++++++++---------------
+ 1 file changed, 16 insertions(+), 15 deletions(-)
+
+--- a/utils/mount/error.c
++++ b/utils/mount/error.c
+@@ -207,16 +207,17 @@ void mount_error(const char *spec, const
+ 				progname, spec);
+ 		break;
+ 	case EINVAL:
+-		nfs_error(_("%s: an incorrect mount option was specified"), progname);
++		nfs_error(_("%s: an incorrect mount option was specified for %s"),
++				progname, mount_point);
+ 		break;
+ 	case EOPNOTSUPP:
+-		nfs_error(_("%s: requested NFS version or transport protocol is not supported"),
+-				progname);
++		nfs_error(_("%s: requested NFS version or transport protocol is not supported for %s"),
++				progname, mount_point);
+ 		break;
+ 	case ENOTDIR:
+ 		if (spec)
+-			nfs_error(_("%s: mount spec %s or point %s is not a "
+-				  "directory"),	progname, spec, mount_point);
++			nfs_error(_("%s: mount spec %s or point %s is not a directory"),
++				  progname, spec, mount_point);
+ 		else
+ 			nfs_error(_("%s: mount point %s is not a directory"),
+ 				  progname, mount_point);
+@@ -227,31 +228,31 @@ void mount_error(const char *spec, const
+ 		break;
+ 	case ENOENT:
+ 		if (spec)
+-			nfs_error(_("%s: mounting %s failed, "
+-				"reason given by server: %s"),
+-				progname, spec, strerror(error));
++			nfs_error(_("%s: mounting %s failed, reason given by server: %s"),
++				  progname, spec, strerror(error));
+ 		else
+ 			nfs_error(_("%s: mount point %s does not exist"),
+-				progname, mount_point);
++				  progname, mount_point);
+ 		break;
+ 	case ESPIPE:
+ 		rpc_mount_errors((char *)spec, 0, 0);
+ 		break;
+ 	case EIO:
+-		nfs_error(_("%s: mount system call failed"), progname);
++		nfs_error(_("%s: mount system call failed for %s"),
++			  progname, mount_point);
+ 		break;
+ 	case EFAULT:
+-		nfs_error(_("%s: encountered unexpected error condition."),
+-				progname);
++		nfs_error(_("%s: encountered unexpected error condition for %s."),
++			  progname, mount_point);
+ 		nfs_error(_("%s: please report the error to" PACKAGE_BUGREPORT),
+-				progname);
++			  progname);
+ 		break;
+ 	case EALREADY:
+ 		/* Error message has already been provided */
+ 		break;
+ 	default:
+-		nfs_error(_("%s: %s"),
+-			progname, strerror(error));
++		nfs_error(_("%s: %s for %s on %s"),
++			  progname, strerror(error), spec, mount_point);
+ 	}
+ }
+ 

0008-nfsd.man-fix-typo-in-section-on-scope.patch

@@ -0,0 +1,23 @@
+From e986a7c109cb25fe9de2de3e376ac6ed09d9dd12 Mon Sep 17 00:00:00 2001
+From: NeilBrown <neilb@suse.de>
+Date: Wed, 29 Mar 2023 09:08:32 +1100
+Subject: [PATCH] nfsd.man: fix typo in section on "scope".
+
+The missing "-" meant that "-S" isn't mentioned at all.
+
+Signed-off-by: NeilBrown <neilb@suse.de>
+---
+ utils/nfsd/nfsd.man |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/utils/nfsd/nfsd.man
++++ b/utils/nfsd/nfsd.man
+@@ -38,7 +38,7 @@ request on all known network addresses.
+ releases of the Linux Kernel. This option can be used multiple times
+ to listen to more than one interface.
+ .TP
+-.B \S " or " \-\-scope scope
++.B \-S " or " \-\-scope scope
+ NFSv4.1 and later require the server to report a "scope" which is used
+ by the clients to detect if two connections are to the same server.
+ By default Linux NFSD uses the host name as the scope.

nfs-utils.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Tue Mar 28 22:37:58 UTC 2023 - Neil Brown <nfbrown@suse.com>
+
+- Add 0007-mount.nfs-always-include-mountpoint-or-spec-if-error.patch
+  boo#1157881
+- Add 0008-nfsd.man-fix-typo-in-section-on-scope.patch
+  bsc#1209859
+- Allow scope to be sed in sysconfig: NFSD_SCOPE
+
+-------------------------------------------------------------------
+Mon Mar 27 10:16:10 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Add explicit pkgconfig(libkeyutils) BuildRequires: nfs-utils
+  requires this for nfsv4 and we should not rely on the devel
+  package being brought in by other deps.
+
 -------------------------------------------------------------------
 Mon Feb  6 00:23:05 UTC 2023 - Neil Brown <nfbrown@suse.com>
 

nfs-utils.spec

@@ -44,6 +44,8 @@ Source27:       nfs-kernel-server.tmpfiles.conf
 Patch0:         nfs-utils-1.0.7-bind-syntax.patch
 Patch5:         0005-modprobe-avoid-error-messages-if-sbin-sysctl-fail.patch
 Patch6:         0006-nfsd-allow-server-scope-to-be-set-with-config-or-com.patch
+Patch7:         0007-mount.nfs-always-include-mountpoint-or-spec-if-error.patch
+Patch8:         0008-nfsd.man-fix-typo-in-section-on-scope.patch
 BuildRequires:  e2fsprogs-devel
 BuildRequires:  gcc-c++
 BuildRequires:  libtool
@@ -55,6 +57,7 @@ BuildRequires:  pkgconfig(devmapper)
 BuildRequires:  pkgconfig(kdb)
 BuildRequires:  pkgconfig(krb5)
 BuildRequires:  pkgconfig(libevent)
+BuildRequires:  pkgconfig(libkeyutils)
 BuildRequires:  pkgconfig(libtirpc)
 BuildRequires:  pkgconfig(mount)
 BuildRequires:  pkgconfig(sqlite3)

nfs.conf

@@ -65,6 +65,7 @@ include = -/etc/nfs.conf.local
 # vers4.2=y
 # rdma=n
 # rdma-port=20049
+ scope=$NFSD_SCOPE
 #
 [statd]
 # debug=0

sysconfig.nfs

@@ -237,3 +237,17 @@ MOUNTD_OPTIONS=""
 # Fully Qualified Domain Names when mounting NFS Shares.
 #
 NFS_GSSD_AVOID_DNS="no"
+
+## Path:                Network/File systems/NFS server
+## Description:         Set v4.1+ scope reported by server
+## Type:                string
+## Default:             ""
+## ServiceRestart:      nfs-server
+#
+# Set the scope reported by the NFS server.  When nothing
+# is given the kernel uses the configured hostname as
+# a default.  When NFS is used in a fail-over configuration
+# it is important that all hosts which server the same resource
+# report the same scope.
+#
+NFSD_SCOPE=""