From 53818bc95678077d8d8255ada1052cb74f00cb86 Mon Sep 17 00:00:00 2001 From: xueyamao Date: Fri, 14 Nov 2025 11:43:19 +0800 Subject: [PATCH] libmultipath: remove pathgroup wildcard options --- ...th-remove-pathgroup-wildcard-options.patch | 33 +++++++++++++++++++ multipath-tools.spec | 6 +++- 2 files changed, 38 insertions(+), 1 deletion(-) create mode 100644 0064-libmultipath-remove-pathgroup-wildcard-options.patch diff --git a/0064-libmultipath-remove-pathgroup-wildcard-options.patch b/0064-libmultipath-remove-pathgroup-wildcard-options.patch new file mode 100644 index 0000000..d416e2b --- /dev/null +++ b/0064-libmultipath-remove-pathgroup-wildcard-options.patch @@ -0,0 +1,33 @@ +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 | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/libmultipath/print.c b/libmultipath/print.c +index b944ef3..91d2243 100644 +--- a/libmultipath/print.c ++++ b/libmultipath/print.c +@@ -792,10 +792,6 @@ snprint_wildcards (char * buff, int len) + for (i = 0; pd[i].header; i++) + fwd += snprintf(buff + fwd, len - fwd, "%%%c %s\n", + pd[i].wildcard, pd[i].header); +- fwd += snprintf(buff + fwd, len - fwd, "\npathgroup format wildcards:\n"); +- for (i = 0; pgd[i].header; i++) +- fwd += snprintf(buff + fwd, len - fwd, "%%%c %s\n", +- pgd[i].wildcard, pgd[i].header); + return fwd; + } + +-- +2.43.0 + diff --git a/multipath-tools.spec b/multipath-tools.spec index 27f25be..3a0448e 100644 --- a/multipath-tools.spec +++ b/multipath-tools.spec @@ -2,7 +2,7 @@ Name: multipath-tools Version: 0.8.4 -Release: 39 +Release: 40 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/ @@ -73,6 +73,7 @@ Patch60: 0060-dm-parts.rules-fix-warning-reported-by-udevadm-verif.patch Patch61: 0061-libmultipath-fix-checker-detection-for-nvme-devices.patch Patch62: 0062-libmpathpersist-set-mpp-mpe-before-selecting-reserva.patch Patch63: 0063-libmultipath-orphan_paths-avoid-BUG-message.patch +Patch64: 0064-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 @@ -221,6 +222,9 @@ fi %changelog +* Fri Nov 14 2025 xueyamao - 0.8.4-40 +- libmultipath: remove pathgroup wildcard options + * Fri Nov 7 2025 xueyamao - 0.8.4-39 - libmultipath: orphan_paths(): avoid BUG message -- Gitee