diff --git a/0010-libmultipath-print-correct-default-for-delay_-_check.patch b/0010-libmultipath-print-correct-default-for-delay_-_check.patch new file mode 100644 index 0000000..6d8f921 --- /dev/null +++ b/0010-libmultipath-print-correct-default-for-delay_-_check.patch @@ -0,0 +1,40 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Benjamin Marzinski +Date: Mon, 7 May 2018 17:16:05 -0500 +Subject: [PATCH] libmultipath: print correct default for delay_*_checks + +These options default to "no", so they should display that when the +config is printed. + +Signed-off-by: Benjamin Marzinski +--- + libmultipath/dict.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/libmultipath/dict.c b/libmultipath/dict.c +index 1a18337..8f9944a 100644 +--- a/libmultipath/dict.c ++++ b/libmultipath/dict.c +@@ -1067,7 +1067,8 @@ print_off_int_undef(char * buff, int len, long v) + } + + declare_def_handler(delay_watch_checks, set_off_int_undef) +-declare_def_snprint(delay_watch_checks, print_off_int_undef) ++declare_def_snprint_defint(delay_watch_checks, print_off_int_undef, ++ DEFAULT_DELAY_CHECKS) + declare_ovr_handler(delay_watch_checks, set_off_int_undef) + declare_ovr_snprint(delay_watch_checks, print_off_int_undef) + declare_hw_handler(delay_watch_checks, set_off_int_undef) +@@ -1075,7 +1076,8 @@ declare_hw_snprint(delay_watch_checks, print_off_int_undef) + declare_mp_handler(delay_watch_checks, set_off_int_undef) + declare_mp_snprint(delay_watch_checks, print_off_int_undef) + declare_def_handler(delay_wait_checks, set_off_int_undef) +-declare_def_snprint(delay_wait_checks, print_off_int_undef) ++declare_def_snprint_defint(delay_wait_checks, print_off_int_undef, ++ DEFAULT_DELAY_CHECKS) + declare_ovr_handler(delay_wait_checks, set_off_int_undef) + declare_ovr_snprint(delay_wait_checks, print_off_int_undef) + declare_hw_handler(delay_wait_checks, set_off_int_undef) +-- +2.7.4 + diff --git a/0011-multipath.conf.5-clarify-property-whitelist-handling.patch b/0011-multipath.conf.5-clarify-property-whitelist-handling.patch new file mode 100644 index 0000000..9f645b1 --- /dev/null +++ b/0011-multipath.conf.5-clarify-property-whitelist-handling.patch @@ -0,0 +1,31 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Benjamin Marzinski +Date: Wed, 9 May 2018 14:32:59 -0500 +Subject: [PATCH] multipath.conf.5: clarify property whitelist handling + +Signed-off-by: Benjamin Marzinski +--- + multipath/multipath.conf.5 | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/multipath/multipath.conf.5 b/multipath/multipath.conf.5 +index c4d0789..8dae0f4 100644 +--- a/multipath/multipath.conf.5 ++++ b/multipath/multipath.conf.5 +@@ -1144,10 +1144,9 @@ and + keywords. For a full description of these keywords please see the \fIdevices\fR + section description. + .LP +-The \fIproperty\fR blacklist and whitelist handling is different from the usual +-handling in the sense that the whitelist \fIhas\fR to be set, otherwise the +-device will be blacklisted. In these cases the message \fIblacklisted, udev +-property missing\fR will be displayed. ++The \fIproperty\fR whitelist handling is different from the usual ++handling in the sense that the device \fIhas\fR to have a udev property that ++matches the whitelist, otherwise the device will be blacklisted. In these cases the message \fIblacklisted, udev property missing\fR will be displayed. + . + . + .\" ---------------------------------------------------------------------------- +-- +2.7.4 + diff --git a/0010-RH-fixup-udev-rules-for-redhat.patch b/0012-RH-fixup-udev-rules-for-redhat.patch similarity index 100% rename from 0010-RH-fixup-udev-rules-for-redhat.patch rename to 0012-RH-fixup-udev-rules-for-redhat.patch diff --git a/0011-RH-Remove-the-property-blacklist-exception-builtin.patch b/0013-RH-Remove-the-property-blacklist-exception-builtin.patch similarity index 65% rename from 0011-RH-Remove-the-property-blacklist-exception-builtin.patch rename to 0013-RH-Remove-the-property-blacklist-exception-builtin.patch index fb48502..3f2a928 100644 --- a/0011-RH-Remove-the-property-blacklist-exception-builtin.patch +++ b/0013-RH-Remove-the-property-blacklist-exception-builtin.patch @@ -14,8 +14,8 @@ it. Signed-off-by: Benjamin Marzinski --- libmultipath/blacklist.c | 15 ++++++--------- - multipath/multipath.conf.5 | 4 ---- - 2 files changed, 6 insertions(+), 13 deletions(-) + multipath/multipath.conf.5 | 14 ++++++++------ + 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/libmultipath/blacklist.c b/libmultipath/blacklist.c index ee396e2..19d4697 100644 @@ -51,7 +51,7 @@ index ee396e2..19d4697 100644 void diff --git a/multipath/multipath.conf.5 b/multipath/multipath.conf.5 -index c4d0789..f046a54 100644 +index 8dae0f4..b1d33d2 100644 --- a/multipath/multipath.conf.5 +++ b/multipath/multipath.conf.5 @@ -1131,10 +1131,6 @@ The \fIWorld Wide Identification\fR of a device. @@ -65,6 +65,23 @@ index c4d0789..f046a54 100644 .TP .B device Subsection for the device description. This subsection recognizes the +@@ -1145,8 +1141,14 @@ keywords. For a full description of these keywords please see the \fIdevices\fR + section description. + .LP + The \fIproperty\fR whitelist handling is different from the usual +-handling in the sense that the device \fIhas\fR to have a udev property that +-matches the whitelist, otherwise the device will be blacklisted. In these cases the message \fIblacklisted, udev property missing\fR will be displayed. ++handling in the sense that if the propery whitelist is set, the device ++\fIhas\fR to have a udev property that matches the whitelist, otherwise the ++device will be blacklisted. In these cases the message \fIblacklisted, udev ++property missing\fR will be displayed. For example settting the ++property blacklist_exception to \fB(SCSI_IDENT_|ID_WWN)\fR will blacklist ++all devices that have no udev property whose name regex matches either ++\fBSCSI_IDENT_\fR or \fBID_WWN\fR. This works to exclude most ++non-multipathable devices. + . + . + .\" ---------------------------------------------------------------------------- -- 2.7.4 diff --git a/0012-RH-don-t-start-without-a-config-file.patch b/0014-RH-don-t-start-without-a-config-file.patch similarity index 100% rename from 0012-RH-don-t-start-without-a-config-file.patch rename to 0014-RH-don-t-start-without-a-config-file.patch diff --git a/0013-RH-use-rpm-optflags-if-present.patch b/0015-RH-use-rpm-optflags-if-present.patch similarity index 100% rename from 0013-RH-use-rpm-optflags-if-present.patch rename to 0015-RH-use-rpm-optflags-if-present.patch diff --git a/0014-RH-add-mpathconf.patch b/0016-RH-add-mpathconf.patch similarity index 100% rename from 0014-RH-add-mpathconf.patch rename to 0016-RH-add-mpathconf.patch diff --git a/0015-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch b/0017-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch similarity index 100% rename from 0015-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch rename to 0017-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch diff --git a/0016-RH-trigger-change-uevent-on-new-device-creation.patch b/0018-RH-trigger-change-uevent-on-new-device-creation.patch similarity index 100% rename from 0016-RH-trigger-change-uevent-on-new-device-creation.patch rename to 0018-RH-trigger-change-uevent-on-new-device-creation.patch diff --git a/0017-RH-warn-on-invalid-regex-instead-of-failing.patch b/0019-RH-warn-on-invalid-regex-instead-of-failing.patch similarity index 93% rename from 0017-RH-warn-on-invalid-regex-instead-of-failing.patch rename to 0019-RH-warn-on-invalid-regex-instead-of-failing.patch index a8b9411..8bcd30e 100644 --- a/0017-RH-warn-on-invalid-regex-instead-of-failing.patch +++ b/0019-RH-warn-on-invalid-regex-instead-of-failing.patch @@ -16,7 +16,7 @@ Signed-off-by: Benjamin Marzinski 3 files changed, 35 insertions(+), 6 deletions(-) diff --git a/libmultipath/dict.c b/libmultipath/dict.c -index 1a18337..167696a 100644 +index 8f9944a..7fcd401 100644 --- a/libmultipath/dict.c +++ b/libmultipath/dict.c @@ -53,6 +53,21 @@ set_str(vector strvec, void *ptr) @@ -41,7 +41,7 @@ index 1a18337..167696a 100644 set_yes_no(vector strvec, void *ptr) { char * buff; -@@ -1199,7 +1214,7 @@ ble_ ## option ## _handler (struct config *conf, vector strvec) \ +@@ -1201,7 +1216,7 @@ ble_ ## option ## _handler (struct config *conf, vector strvec) \ if (!conf->option) \ return 1; \ \ @@ -50,7 +50,7 @@ index 1a18337..167696a 100644 if (!buff) \ return 1; \ \ -@@ -1215,7 +1230,7 @@ ble_ ## option ## _ ## name ## _handler (struct config *conf, vector strvec) \ +@@ -1217,7 +1232,7 @@ ble_ ## option ## _ ## name ## _handler (struct config *conf, vector strvec) \ if (!conf->option) \ return 1; \ \ @@ -59,7 +59,7 @@ index 1a18337..167696a 100644 if (!buff) \ return 1; \ \ -@@ -1316,16 +1331,16 @@ device_handler(struct config *conf, vector strvec) +@@ -1318,16 +1333,16 @@ device_handler(struct config *conf, vector strvec) return 0; } diff --git a/device-mapper-multipath.spec b/device-mapper-multipath.spec index ae86cae..d461ed0 100644 --- a/device-mapper-multipath.spec +++ b/device-mapper-multipath.spec @@ -1,7 +1,7 @@ Summary: Tools to manage multipath devices using device-mapper Name: device-mapper-multipath Version: 0.7.6 -Release: 3.git1cb704b%{?dist} +Release: 4.git1cb704b%{?dist} License: GPL+ Group: System Environment/Base URL: http://christophe.varoqui.free.fr/ @@ -20,14 +20,16 @@ Patch0006: 0006-libmultipath-don-t-print-undefined-values.patch Patch0007: 0007-libmultipath-Fix-logic-in-should_multipath.patch Patch0008: 0008-multipathd-add-failures-path-format-wildcard.patch Patch0009: 0009-multipathd-fix-reservation_key-check.patch -Patch0010: 0010-RH-fixup-udev-rules-for-redhat.patch -Patch0011: 0011-RH-Remove-the-property-blacklist-exception-builtin.patch -Patch0012: 0012-RH-don-t-start-without-a-config-file.patch -Patch0013: 0013-RH-use-rpm-optflags-if-present.patch -Patch0014: 0014-RH-add-mpathconf.patch -Patch0015: 0015-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch -Patch0016: 0016-RH-trigger-change-uevent-on-new-device-creation.patch -Patch0017: 0017-RH-warn-on-invalid-regex-instead-of-failing.patch +Patch0010: 0010-libmultipath-print-correct-default-for-delay_-_check.patch +Patch0011: 0011-multipath.conf.5-clarify-property-whitelist-handling.patch +Patch0012: 0012-RH-fixup-udev-rules-for-redhat.patch +Patch0013: 0013-RH-Remove-the-property-blacklist-exception-builtin.patch +Patch0014: 0014-RH-don-t-start-without-a-config-file.patch +Patch0015: 0015-RH-use-rpm-optflags-if-present.patch +Patch0016: 0016-RH-add-mpathconf.patch +Patch0017: 0017-RH-add-wwids-from-kernel-cmdline-mpath.wwids-with-A.patch +Patch0018: 0018-RH-trigger-change-uevent-on-new-device-creation.patch +Patch0019: 0019-RH-warn-on-invalid-regex-instead-of-failing.patch # runtime Requires: %{name}-libs = %{version}-%{release} @@ -123,6 +125,8 @@ device-mapper-multipath's libdmmp C API library %patch0015 -p1 %patch0016 -p1 %patch0017 -p1 +%patch0018 -p1 +%patch0019 -p1 cp %{SOURCE1} . %build @@ -246,6 +250,16 @@ fi %{_pkgconfdir}/libdmmp.pc %changelog +* Tue May 15 2018 Benjamin Marzinski 0.7.6-4.git1cb704b +- Add 0010-libmultipath-print-correct-default-for-delay_-_check.patch + * fix minor configuration printing issue +- Add 0011-multipath.conf.5-clarify-property-whitelist-handling.patch + * clarify property blacklist_excecptions handling in man page +- Rename files + * Previous patches 0010-0017 are now patches 0012-0019 +- Modify 0013-RH-Remove-the-property-blacklist-exception-builtin.patch + * clarify changes in man page + * Tue Apr 24 2018 Benjamin Marzinski 0.7.6-3.git1cb704b - Add 0008-multipathd-add-failures-path-format-wildcard.patch - Add 0009-multipathd-fix-reservation_key-check.patch