- 0006-nfs.conf-silence-include-error.patch

Avoid an unhelpful warning (bsc#1150807)

OBS-URL: https://build.opensuse.org/package/show/Base:System/nfs-utils?expand=0&rev=205

0006-nfs.conf-silence-include-error.patch

@@ -0,0 +1,20 @@
+---
+ support/nfs/conffile.c |    7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+--- a/support/nfs/conffile.c
++++ b/support/nfs/conffile.c
+@@ -418,9 +418,10 @@ conf_parse_line(int trans, char *line, c
+ 
+ 		subconf = conf_readfile(relpath);
+ 		if (subconf == NULL) {
+-			xlog_warn("config error at %s:%d: "
+-				"error loading included config",
+-				  filename, lineno);
++			// This warning is not helpful
++			//xlog_warn("config error at %s:%d: "
++			//	"error loading included config",
++			//	  filename, lineno);
+ 			if (relpath)
+ 				free(relpath);
+ 			return;

nfs-utils.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Sep 16 05:56:12 UTC 2019 - Neil Brown <nfbrown@suse.com>
+
+- 0006-nfs.conf-silence-include-error.patch
+ Avoid an unhelpful warning (bsc#1150807)
+
 -------------------------------------------------------------------
 Mon Sep  2 05:25:07 UTC 2019 - Neil Brown <nfbrown@suse.com>
 

nfs-utils.spec

@@ -50,6 +50,7 @@ Patch2:         0002-Let-systemd-know-when-rpc.statd-is-needed.patch
 Patch3:         0003-systemd-run-statd-notify-even-when-nfs-client-isn-t-.patch
 Patch4:         0004-nfsidmap-honour-with-pluginpath-for-instalation.patch
 Patch5:         0005-nfs.conf-fail-to-disable-major-NFS-version-4-using-v.patch
+Patch6:         0006-nfs.conf-silence-include-error.patch
 
 BuildRequires:  e2fsprogs-devel
 BuildRequires:  fedfs-utils-devel
@@ -152,6 +153,7 @@ This package contains additional NFS documentation.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 cp %{SOURCE6} .