diff --git a/0019-fix-find-multipath-failure.patch b/0019-fix-find-multipath-failure.patch index 7d87131..6b60a84 100644 --- a/0019-fix-find-multipath-failure.patch +++ b/0019-fix-find-multipath-failure.patch @@ -7,14 +7,15 @@ when DEFAULT_FIND_MULTIPATHS is FIND_MULTIPATHS_STRICT, it fail to find multipath in find_multipaths function, use FIND_MULTIPATHS_OFF instead of FIND_MULTIPATHS_STRICT. --- - libmultipath/defaults.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + libmultipath/defaults.h | 2 +- + multipath/multipath.conf.5 | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libmultipath/defaults.h b/libmultipath/defaults.h -index 7f3839f..c84d31d 100644 +index a5e9ea0..514fd88 100644 --- a/libmultipath/defaults.h +++ b/libmultipath/defaults.h -@@ -17,7 +17,7 @@ +@@ -23,7 +23,7 @@ #define DEFAULT_NO_PATH_RETRY NO_PATH_RETRY_UNDEF #define DEFAULT_VERBOSITY 2 #define DEFAULT_REASSIGN_MAPS 0 @@ -23,6 +24,19 @@ index 7f3839f..c84d31d 100644 #define DEFAULT_FAST_IO_FAIL 5 #define DEFAULT_DEV_LOSS_TMO 600 #define DEFAULT_RETAIN_HWHANDLER RETAIN_HWHANDLER_ON +diff --git a/multipath/multipath.conf.5 b/multipath/multipath.conf.5 +index 284282c..94acd44 100644 +--- a/multipath/multipath.conf.5 ++++ b/multipath/multipath.conf.5 +@@ -1164,7 +1164,7 @@ as non-multipath and passed on to upper layers. + \fBNote:\fR this may cause delays during device detection if + there are single-path devices which aren\'t blacklisted. + .TP +-The default is: \fBstrict\fR ++The default is: \fBoff\fR + .RE + . + . -- -1.8.3.1 +2.27.0 diff --git a/0048-multipath.conf.5-fix-documentation-for-find_multipat.patch b/0048-multipath.conf.5-fix-documentation-for-find_multipat.patch new file mode 100644 index 0000000..5cb261c --- /dev/null +++ b/0048-multipath.conf.5-fix-documentation-for-find_multipat.patch @@ -0,0 +1,40 @@ +From 89fa0ba868858482c0e08be6f9f04f36a8a0c020 Mon Sep 17 00:00:00 2001 +From: Martin Wilck +Date: Sat, 10 Feb 2024 20:38:35 +0100 +Subject: [PATCH] multipath.conf.5: fix documentation for find_multipaths + +Document "on" and "off", and mention that "yes"/"1" and "no"/"0" are +still accepted as alias values. + +Suggested-by: Paul Donohue +Signed-off-by: Martin Wilck +--- + multipath/multipath.conf.5 | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +diff --git a/multipath/multipath.conf.5 b/multipath/multipath.conf.5 +index 94acd44..b2d3b3a 100644 +--- a/multipath/multipath.conf.5 ++++ b/multipath/multipath.conf.5 +@@ -1139,13 +1139,15 @@ listed in the \fBwwids_file\fR. Users can manually set up multipath maps using t + \fBmultipathd add map\fR command. Once set up manually, the map is + remembered in the wwids file and will be set up automatically in the future. + .TP +-.I no ++.I off + Multipath behaves like \fBstrict\fR. Multipathd behaves like \fBgreedy\fR. ++\fIno\fR or \fI0\fR is accepted as an alias for \fIoff\fR. + .TP +-.I yes ++.I on + Both multipathd and multipath treat a device as multipath device if the + conditions for \fBstrict\fR are met, or if at least two non-blacklisted paths +-with the same WWID have been detected. ++with the same WWID have been detected. \fIyes\fR or \fI1\fR is accepted as an ++alias for \fIon\fR. + .TP + .I greedy + Both multipathd and multipath treat every non-blacklisted device as multipath +-- +2.27.0 + diff --git a/multipath-tools.spec b/multipath-tools.spec index 4c9ed31..b40323f 100644 --- a/multipath-tools.spec +++ b/multipath-tools.spec @@ -2,7 +2,7 @@ Name: multipath-tools Version: 0.8.4 -Release: 23 +Release: 24 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/ @@ -57,6 +57,7 @@ Patch44: 0044-multipathd.socket-add-missing-conditions-from-servic.patch Patch45: 0045-libmultipath-ignore-multipaths-sections-without-wwid.patch Patch46: 0046-libmultipath-check-for-null-wwid-before-strcmp.patch Patch47: 0047-libmultipath-sysfs_set_scsi_tmo-do-nothing-for-ACT_D.patch +Patch48: 0048-multipath.conf.5-fix-documentation-for-find_multipat.patch BuildRequires: multipath-tools, libcmocka, libcmocka-devel BuildRequires: gcc, libaio-devel, userspace-rcu-devel, device-mapper-devel >= 1.02.89 @@ -204,6 +205,9 @@ fi %changelog +* Fri Jul 5 2024 kouwenqi - 0.8.4-24 +- multipath.conf.5: fix documentation for find_multipaths + * Wed Jun 5 2024 kouwenqi - 0.8.4-23 - libmultipath: sysfs_set_scsi_tmo: do nothing for ACT_DRY_RUN