From 5166430945019f3a19607a5198932691afbe048d Mon Sep 17 00:00:00 2001 From: xueyamao Date: Fri, 14 Nov 2025 11:17:35 +0800 Subject: [PATCH] libmultipath: remove pathgroup wildcard options (cherry picked from commit 1da23293661ed1b41c7ed25e1e166bfc3969861b) --- ...th-remove-pathgroup-wildcard-options.patch | 36 +++++++++++++++++++ multipath-tools.spec | 6 +++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 0030-libmultipath-remove-pathgroup-wildcard-options.patch diff --git a/0030-libmultipath-remove-pathgroup-wildcard-options.patch b/0030-libmultipath-remove-pathgroup-wildcard-options.patch new file mode 100644 index 0000000..7648b40 --- /dev/null +++ b/0030-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 efd5a16a..89813517 100644 +--- a/libmultipath/print.c ++++ b/libmultipath/print.c +@@ -912,13 +912,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; i < ARRAY_SIZE(pgd); 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 7bd4594..c7399ec 100644 --- a/multipath-tools.spec +++ b/multipath-tools.spec @@ -1,7 +1,7 @@ #needsrootforbuild Name: multipath-tools Version: 0.9.5 -Release: 14 +Release: 15 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-Revert-multipathd-Fixed-multipathd-parameter-invokin.patch Patch27: 0027-11-dm-mpath.rules-fix-warnings-reported-by-udevadm-v.patch Patch28: 0028-dm-parts.rules-fix-warning-reported-by-udevadm-verif.patch Patch29: 0029-libmpathpersist-set-mpp-mpe-before-selecting-reserva.patch +Patch30: 0030-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 @@ -187,6 +188,9 @@ fi %changelog +* Fri Nov 14 2025 xueyamao - 0.9.5-15 +- libmultipath: remove pathgroup wildcard options + * Fri Oct 17 2025 xueyamao - 0.9.5-14 - libmpathpersist: set mpp->mpe before selecting reservation_key -- Gitee