multipath.conf.5: fix documentation for find_multipaths

(cherry picked from commit a88eba0212d29220f3e83650c6e52cd14cc5bc71)

0012-device-mapper-multipath-fix-find-multipath-failure.patch

@@ -7,11 +7,12 @@ 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 c27946c..e0dd32a 100644
+index a5e9ea0..514fd88 100644
 --- a/libmultipath/defaults.h
 +++ b/libmultipath/defaults.h
 @@ -23,7 +23,7 @@
@@ -23,6 +24,19 @@ index c27946c..e0dd32a 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
 

0030-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 <mwilck@suse.com>
+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 <github@PaulSD.com>
+Signed-off-by: Martin Wilck <mwilck@suse.com>
+---
+ 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
+

multipath-tools.spec

@@ -1,7 +1,7 @@
 #needsrootforbuild
 Name:    multipath-tools
 Version: 0.8.7
-Release: 12
+Release: 13
 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/
@@ -38,6 +38,7 @@ 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-multipathd.socket-add-missing-conditions-from-servic.patch
 Patch29: 0029-libmultipath-sysfs_set_scsi_tmo-do-nothing-for-ACT_D.patch
+Patch30: 0030-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
@@ -185,6 +186,9 @@ fi
 
 
 %changelog
+* Fri Jul 5 2024 kouwenqi <kouwenqi@kylinos.cn> - 0.8.7-13
+- multipath.conf.5: fix documentation for find_multipaths
+
 * Wed Jun 5 2024 kouwenqi <kouwenqi@kylinos.cn> - 0.8.7-12
 - libmultipath: sysfs_set_scsi_tmo: do nothing for ACT_DRY_RUN