b05147c356
Change patch format to remove Git version
* Patches 0001-0122 only have the patch format modified
Update to the head of the upstream staging branch plus redhat patches
* Patches 0123-0134 & 1036-0142 are from the upstream staging branch
* Patches 0143-1046 have been submitted upstream
* Patch 0156 is a Red Hat only patch. Red Hat udev rules set ID_SERIAL
from 60-persistent-storage.rules instead of 55-scsi-sg3_id.rules.
Multipath's parse_vpd_pg83() function needs to match the ID_SERIAL
value from udev.
Rename files
* Previous patches 0123-0132 are now patches 1035 & 0147-0155
40 lines
1.2 KiB
Diff
40 lines
1.2 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Date: Fri, 18 Dec 2020 17:06:39 -0600
|
|
Subject: [PATCH] libmultipath: warn about missing braces at end of
|
|
multipath.conf
|
|
|
|
Multipath doesn't warn when multipath.conf is missing closing braces at
|
|
the end of the file. This has confused people about the correct config
|
|
file syntax, so add a warning.
|
|
|
|
Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
|
|
Reviewed-by: Martin Wilck <mwilck@suse.com>
|
|
---
|
|
libmultipath/parser.c | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/libmultipath/parser.c b/libmultipath/parser.c
|
|
index 163ffbc9..c70243c3 100644
|
|
--- a/libmultipath/parser.c
|
|
+++ b/libmultipath/parser.c
|
|
@@ -537,7 +537,7 @@ process_stream(struct config *conf, FILE *stream, vector keywords,
|
|
if (!strcmp(str, EOB)) {
|
|
if (kw_level > 0) {
|
|
free_strvec(strvec);
|
|
- break;
|
|
+ goto out;
|
|
}
|
|
condlog(0, "unmatched '%s' at line %d of %s",
|
|
EOB, line_nr, file);
|
|
@@ -576,7 +576,8 @@ process_stream(struct config *conf, FILE *stream, vector keywords,
|
|
|
|
free_strvec(strvec);
|
|
}
|
|
-
|
|
+ if (kw_level == 1)
|
|
+ condlog(1, "missing '%s' at end of %s", EOB, file);
|
|
out:
|
|
FREE(buf);
|
|
free_uniques(uniques);
|