!112 [sync] PR-111: multipath fix exit status of multipath -T

From: @openeuler-sync-bot 
Reviewed-by: @liuzhiqiang26 
Signed-off-by: @liuzhiqiang26
This commit is contained in:
openeuler-ci-bot 2022-10-19 07:46:21 +00:00 committed by Gitee
commit 4fc74dec84
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 33 additions and 2 deletions

View File

@ -0,0 +1,28 @@
From be516ed39d0d565cd20e603473b77f19775e86ce Mon Sep 17 00:00:00 2001
From: Martin Wilck <mwilck@suse.com>
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 <mwilck@suse.com>
Reviewed-by: Benjamin Marzinski <bmarzins@redhat.com>
---
multipath/main.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/multipath/main.c b/multipath/main.c
index cf9d2a2..8071d8a 100644
--- a/multipath/main.c
+++ b/multipath/main.c
@@ -697,6 +697,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

View File

@ -2,7 +2,7 @@
Name: multipath-tools
Version: 0.8.4
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/
@ -42,7 +42,7 @@ Patch29: 0029-clear-path-in-mpp-pg-in-clear_ref_from_mpp.patch
Patch30: 0030-multipathd-fix-mpp-hwe-use-after-free-in-ev_remove_p.patch
Patch31: 0031-libmultipath-fix-daemon-memory-leak-in-disassemble_m.patch
Patch32: 0032-libmultipath-fix-multipathd-coredump-in-disassemble_.patch
Patch33: 0033-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, git
@ -188,6 +188,9 @@ fi
%changelog
* Tue Oct 18 2022 xueyamao<xueyamao@kylinos.cn> - 0.8.4-15
- multipath fix exit status of multipath -T
* Fri Apr 8 2022 lixiaokeng<lixiaokeng@huawei.com> - 0.8.4-14
- fix coredump and memory leak in long-term stability test