device-mapper-multipath-0.9.7-2

Modify 0006-RH-add-mpathconf.patch
Modify 0008-RH-reset-default-find_mutipaths-value-to-off.patch
  * Fix find_multipaths values in docs and mpathconf

Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>

0006-RH-add-mpathconf.patch

@@ -10,6 +10,7 @@ command line.  But, mostly it is used to get a multipath.conf file
 with the OS defaults, and to enable and disable multipathing via
 a single command.
 
+Co-authored-by: Paul Donohue <git@PaulSD.com>
 Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
 ---
  libmultipath/config.c |   2 +
@@ -69,7 +70,7 @@ index 504d6892..9f14036c 100644
  
 diff --git a/multipath/mpathconf b/multipath/mpathconf
 new file mode 100644
-index 00000000..319664b1
+index 00000000..ce430075
 --- /dev/null
 +++ b/multipath/mpathconf
 @@ -0,0 +1,658 @@
@@ -106,7 +107,7 @@ index 00000000..319664b1
 +
 +defaults {
 +	user_friendly_names yes
-+	find_multipaths yes
++	find_multipaths on
 +}"
 +
 +CONFIGFILE="/etc/multipath.conf"
@@ -124,7 +125,7 @@ index 00000000..319664b1
 +	echo "Disable: --disable"
 +	echo "Only allow certain wwids (instead of enable): --allow <WWID>"
 +	echo "Set user_friendly_names (Default y): --user_friendly_names <y|n>"
-+	echo "Set find_multipaths (Default y): --find_multipaths <yes|no|strict|greedy|smart>"
++	echo "Set find_multipaths (Default on): --find_multipaths <on|yes|y|off|no|n|strict|greedy|smart>"
 +	echo "Set default property blacklist (Default n): --property_blacklist <y|n>"
 +	echo "Set enable_foreign to show foreign devices (Default n): --enable_foreign <y|n>"
 +	echo "Set recheck_wwid (Defaut n): --recheck_wwid <y|n>"
@@ -328,11 +329,11 @@ index 00000000..319664b1
 +		exit 1
 +	fi
 +	if [ "$FIND" = "y" ]; then
-+		FIND="yes"
++		FIND="on"
 +	elif [ "$FIND" = "n" ]; then
-+		FIND="no"
-+	elif [ -n "$FIND" ] && [ "$FIND" != "yes" -a "$FIND" != "no" -a "$FIND" != "strict" -a "$FIND" != "greedy" -a "$FIND" != "smart" ]; then
-+		echo "--find_multipaths must be one of 'yes' 'no' 'strict' 'greedy' or 'smart'"
++		FIND="off"
++	elif [ -n "$FIND" ] && [ "$FIND" != "on" -a "$FIND" != "yes" -a "$FIND" != "off" -a "$FIND" != "no" -a "$FIND" != "strict" -a "$FIND" != "greedy" -a "$FIND" != "smart" ]; then
++		echo "--find_multipaths must be one of 'on' 'yes' 'y' 'off' 'no' 'n' 'strict' 'greedy' or 'smart'"
 +		exit 1
 +	fi
 +	if [ -n "$PROPERTY" ] && [ "$PROPERTY" != "y" -a "$PROPERTY" != "n" ]; then
@@ -497,7 +498,7 @@ index 00000000..319664b1
 +		echo "multipath is disabled"
 +	fi
 +	if [ -z "$HAVE_FIND" ]; then
-+		echo "find_multipaths is no"
++		echo "find_multipaths is off"
 +	else
 +		echo "find_multipaths is $HAVE_FIND"
 +	fi
@@ -733,7 +734,7 @@ index 00000000..319664b1
 +fi
 diff --git a/multipath/mpathconf.8 b/multipath/mpathconf.8
 new file mode 100644
-index 00000000..9c2fb835
+index 00000000..ea025f31
 --- /dev/null
 +++ b/multipath/mpathconf.8
 @@ -0,0 +1,151 @@
@@ -779,10 +780,10 @@ index 00000000..9c2fb835
 +.B user_friendly_names
 +set and
 +.B find_multipaths
-+set to \fByes\fP. To disable these, use the
++set to \fBon\fP. To disable these, use the
 +.B --user_friendly_names n
 +and
-+.B --find_multipaths n
++.B --find_multipaths off
 +options
 +.SH COMMANDS
 +.TP
@@ -825,7 +826,7 @@ index 00000000..9c2fb835
 +sets an existing \fBrecheck_wwid\fP line to \fBno\fP. This command can be used
 +along with any other command.
 +.TP
-+.B --find_multipaths\fP { \fByes\fP | \fBno\fP | \fBstrict\fP | \fBgreedy\fP | \fBsmart\fP }
++.B --find_multipaths\fP { \fBon\fP | \fByes\fP | \fBy\fP | \fBoff\fP | \fBno\fP | \fBn\fP | \fBstrict\fP | \fBgreedy\fP | \fBsmart\fP }
 +If set to \fB<value>\fP, this adds the line
 +.B find_multipaths <value>
 +to the

0008-RH-reset-default-find_mutipaths-value-to-off.patch

@@ -6,10 +6,12 @@ Subject: [PATCH] RH: reset default find_mutipaths value to off
 Upstream has changed to default find_multipaths to "strict". For now
 Redhat will retain the previous default of "off".
 
+Co-authored-by: Paul Donohue <git@PaulSD.com>
 Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
 ---
  libmultipath/defaults.h       | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ multipath/multipath.conf.5.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/libmultipath/defaults.h b/libmultipath/defaults.h
 index 64b633f2..5bda9f93 100644
@@ -24,3 +26,16 @@ index 64b633f2..5bda9f93 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.in b/multipath/multipath.conf.5.in
+index 87b3b2a5..8e246571 100644
+--- a/multipath/multipath.conf.5.in
++++ b/multipath/multipath.conf.5.in
+@@ -1213,7 +1213,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
+ .
+ .

device-mapper-multipath.spec

@@ -1,6 +1,6 @@
 Name:    device-mapper-multipath
 Version: 0.9.7
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Tools to manage multipath devices using device-mapper
 License: GPLv2
 URL:     http://christophe.varoqui.free.fr/
@@ -231,6 +231,11 @@ fi
 %{_pkgconfdir}/libdmmp.pc
 
 %changelog
+* Tue Nov 28 2023 Paul Donohue <git@PaulSD.com> - 0.9.7-2
+- Modify 0006-RH-add-mpathconf.patch
+- Modify 0008-RH-reset-default-find_mutipaths-value-to-off.patch
+  * Fix find_multipaths values in docs and mpathconf
+
 * Tue Nov 21 2023 Benjamin Marzinski <bmarzins@redhat.com> - 0.9.7-1
 - Update source to upstream version 0.9.7
   * Previous patches 0001-0040 are included in the source tarball