File 0001-conffile-Don-t-give-warning-for-optional-c... of Package nfs-utils

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-conffile-Don-t-give-warning-for-optional-config-file.patch of Package nfs-utils (Revision 8bf2ef423eebb14d2fa03344266c1b25)

Currently displaying revision 8bf2ef423eebb14d2fa03344266c1b25 , Show latest

From 1c20fcd0a315f3c692a465159985e6125289f4e4 Mon Sep 17 00:00:00 2001
From: NeilBrown <neilb@suse.de>
Date: Fri, 27 Mar 2020 15:58:24 +1100
Subject: [PATCH] conffile: Don't give warning for optional config files.

A recent commit added the possibility of optional config files for which
warning messages would be suppressed.
Unfortunately only one of the possible warning messages - the least
likely one - was suppressed.

This patch suppresses the other.

Fixes: c6fdcbe0a5cf ("conffile: allow optional include files")
Signed-off-by: NeilBrown <neilb@suse.de>
---
 support/nfs/conffile.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- a/support/nfs/conffile.c
+++ b/support/nfs/conffile.c
@@ -429,9 +429,9 @@ 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);
+			if (!optional)
+				xlog_warn("config error at %s:%d: error loading included config",
+					  filename, lineno);
 			if (relpath)
 				free(relpath);
 			return;

Places

File 0001-conffile-Don-t-give-warning-for-optional-config-file.patch of Package nfs-utils (Revision 8bf2ef423eebb14d2fa03344266c1b25)

Places