From 662ba5870ae19dfb4c4049863b47e76144c6dfcd Mon Sep 17 00:00:00 2001 From: xueyamao Date: Mon, 10 Oct 2022 17:40:27 +0800 Subject: [PATCH] multipath fix exit status of multipath -T We must set the return value in configure(). Signed-off-by: xueyamao (cherry picked from commit d3b45029abc80a0eabd77b760a254f24a95e76fd) --- ...ipath-fix-exit-status-of-multipath-T.patch | 28 +++++++++++++++++++ multipath-tools.spec | 7 +++-- 2 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 0017-multipath-fix-exit-status-of-multipath-T.patch diff --git a/0017-multipath-fix-exit-status-of-multipath-T.patch b/0017-multipath-fix-exit-status-of-multipath-T.patch new file mode 100644 index 0000000..e5a5955 --- /dev/null +++ b/0017-multipath-fix-exit-status-of-multipath-T.patch @@ -0,0 +1,28 @@ +From c9c063b6cef7c922fb5b509bd59c597fa1f673d6 Mon Sep 17 00:00:00 2001 +From: Martin Wilck +Date: Fri, 22 Oct 2021 12:58:11 +0200 +Subject: [PATCH] multipath: fix exit status of multipath -T + +We must set the return value in configure(). + +Signed-off-by: Martin Wilck +Reviewed-by: Benjamin Marzinski +--- + multipath/main.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/multipath/main.c b/multipath/main.c +index 743f3e0..e964792 100644 +--- a/multipath/main.c ++++ b/multipath/main.c +@@ -560,6 +560,7 @@ configure (struct config *conf, enum mpath_cmds cmd, + + dump_config(conf, hwes, curmp); + vector_free(hwes); ++ r = RTVL_OK; + goto out; + } + +-- +2.33.0 + diff --git a/multipath-tools.spec b/multipath-tools.spec index 7cc0e4b..9df8b7b 100644 --- a/multipath-tools.spec +++ b/multipath-tools.spec @@ -1,7 +1,7 @@ #needsrootforbuild Name: multipath-tools Version: 0.8.7 -Release: 3 +Release: 4 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/ @@ -25,7 +25,7 @@ Patch13: 0013-kpartx-change-kpartx-file-and-default-bindir.patch Patch14: 0014-remove-local-disk-from-pathvec.patch Patch15: 0015-clear-mpp-path-reference-when-path-is-freed-otherwis.patch Patch16: 0016-multipath-return-failure-on-an-invalid-remove-cmd.patch - +Patch17: 0017-multipath-fix-exit-status-of-multipath-T.patch BuildRequires: multipath-tools, libcmocka, libcmocka-devel BuildRequires: gcc, libaio-devel, userspace-rcu-devel, device-mapper-devel >= 1.02.89 BuildRequires: libselinux-devel, libsepol-devel, readline-devel, ncurses-devel, @@ -171,6 +171,9 @@ fi %changelog +* Fri Sep 2 2022 xueyamao - 0.8.7-4 +- multipath fix exit status of multipath -T + * Wed Aug 31 2022 xueyamao - 0.8.7-3 - fix multipath return failure on an invalid remove command -- Gitee