diff --git a/0039-libmultipath-remove-pathgroup-wildcard-options.patch b/0039-libmultipath-remove-pathgroup-wildcard-options.patch new file mode 100644 index 0000000000000000000000000000000000000000..60dbfa34ca8d4a71f56eb1f3db9123824ab26a4a --- /dev/null +++ b/0039-libmultipath-remove-pathgroup-wildcard-options.patch @@ -0,0 +1,36 @@ +From 906704947bfcf7d730c622d982ee8eaed8540410 Mon Sep 17 00:00:00 2001 +From: Nitin Yewale +Date: Thu, 30 May 2024 12:54:54 -0400 +Subject: [PATCH] libmultipath: remove pathgroup wildcard options + +The multipathd command "multipathd show wildcards" shows the pathgroup +format wildcards, but there is no way to use them in a multipathd +command. + +Signed-off-by: Benjamin Marzinski +Reviewed-by: Martin Wilck +--- + libmultipath/print.c | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/libmultipath/print.c b/libmultipath/print.c +index 2fb9f4e..a9ea168 100644 +--- a/libmultipath/print.c ++++ b/libmultipath/print.c +@@ -834,13 +834,6 @@ int snprint_wildcards(struct strbuf *buff) + pd[i].wildcard, pd[i].header)) < 0) + return rc; + +- if ((rc = append_strbuf_str(buff, "\npathgroup format wildcards:\n")) < 0) +- return rc; +- for (i = 0; pgd[i].header; i++) +- if ((rc = print_strbuf(buff, "%%%c %s\n", +- pgd[i].wildcard, pgd[i].header)) < 0) +- return rc; +- + return get_strbuf_len(buff) - initial_len; + } + +-- +2.43.0 + diff --git a/multipath-tools.spec b/multipath-tools.spec index 68ff7edce02d9581a50e0fb9a3a3b0c95bbc69ed..8d836eca7460c2bed43866f2a2fa46cb4b67d05d 100644 --- a/multipath-tools.spec +++ b/multipath-tools.spec @@ -1,7 +1,7 @@ #needsrootforbuild Name: multipath-tools Version: 0.8.7 -Release: 22 +Release: 23 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/ @@ -47,6 +47,7 @@ Patch35: 0035-libmultipath-set-clear-handled-flag-only-in-coalesce.patch Patch36: 0036-11-dm-mpath.rules-fix-warnings-reported-by-udevadm-v.patch Patch37: 0037-dm-parts.rules-fix-warning-reported-by-udevadm-verif.patch Patch38: 0038-libmpathpersist-set-mpp-mpe-before-selecting-reserva.patch +Patch39: 0039-libmultipath-remove-pathgroup-wildcard-options.patch BuildRequires: multipath-tools, libcmocka, libcmocka-devel BuildRequires: gcc, libaio-devel, userspace-rcu-devel, device-mapper-devel >= 1.02.89 @@ -195,6 +196,9 @@ fi %changelog +* Fri Nov 14 2025 xueyamao - 0.8.7-23 +- libmultipath: remove pathgroup wildcard options + * Thu Oct 30 2025 xueyamao - 0.8.7-22 - libmpathpersist: set mpp->mpe before selecting reservation_key