diff --git a/0028-libmultipath-print-the-correct-file-when-parsing-fai.patch b/0028-libmultipath-print-the-correct-file-when-parsing-fai.patch new file mode 100644 index 0000000000000000000000000000000000000000..e460392c3e35b25706981bbb64206b7b3274298e --- /dev/null +++ b/0028-libmultipath-print-the-correct-file-when-parsing-fai.patch @@ -0,0 +1,31 @@ +From 7b0ea73ab3f9b33ba61c58f8dbf92a32d42da80c Mon Sep 17 00:00:00 2001 +From: Benjamin Marzinski +Date: Thu, 11 Nov 2021 12:53:46 -0600 +Subject: [PATCH] libmultipath: print the correct file when parsing fails + +Don't assume that parsing failed on multipath.conf + +Signed-off-by: Benjamin Marzinski +Reviewed-by: Martin Wilck +--- + libmultipath/parser.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libmultipath/parser.c b/libmultipath/parser.c +index 8ca91bf..b493a8d 100644 +--- a/libmultipath/parser.c ++++ b/libmultipath/parser.c +@@ -561,8 +561,8 @@ process_stream(struct config *conf, FILE *stream, vector keywords, + t = (*keyword->handler) (conf, strvec); + r += t; + if (t) +- condlog(1, "multipath.conf +%d, parsing failed: %s", +- line_nr, buf); ++ condlog(1, "%s line %d, parsing failed: %s", ++ file, line_nr, buf); + } + + if (keyword->sub) { +-- +2.23.0 + diff --git a/multipath-tools.spec b/multipath-tools.spec index a3f1352ebd9df1df749f950d71e947337d2bdd14..dd91f921c48f6e50dc6295c0fdc2706ceaee4c2b 100644 --- a/multipath-tools.spec +++ b/multipath-tools.spec @@ -1,7 +1,7 @@ #needsrootforbuild Name: multipath-tools Version: 0.8.7 -Release: 10 +Release: 11 Summary: Tools to manage multipath devices with the device-mapper License: GPL-2.0-or-later and LGPL-2.0-only URL: http://christophe.varoqui.free.fr/ @@ -36,6 +36,7 @@ Patch24: 0024-libmultipath-use-directio-checker-for-LIO-targets.patch Patch25: 0025-multipathd-make-pr-registration-consistent.patch Patch26: 0026-libmultipath-io_err_stat-don-t-free-aio-memory-befor.patch Patch27: 0027-libmultipath-io_err_stat-call-io_destroy-inside-free.patch +Patch28: 0028-libmultipath-print-the-correct-file-when-parsing-fai.patch BuildRequires: multipath-tools, libcmocka, libcmocka-devel BuildRequires: gcc, libaio-devel, userspace-rcu-devel, device-mapper-devel >= 1.02.89 @@ -183,6 +184,9 @@ fi %changelog +* Tue Apr 23 2024 kouwenqi - 0.8.7-11 +- libmultipath: print the correct file when parsing fails + * Tue Dec 19 2023 wangzhiqiang - 0.8.7-10 - fix coredump in io_err_stat