diff --git a/0050-multipath-display-the-correct-configuration-when-dum.patch b/0050-multipath-display-the-correct-configuration-when-dum.patch index 772509d3552132ceadbebc46655d51cc7d6291fe..45a5443103bd958d32dd93f37df02d078f2101db 100644 --- a/0050-multipath-display-the-correct-configuration-when-dum.patch +++ b/0050-multipath-display-the-correct-configuration-when-dum.patch @@ -1,54 +1,44 @@ -From d03a21a3474993cdf95c73da7ea70308659c3d70 Mon Sep 17 00:00:00 2001 +From 0802e9dfd27e2333615e8068d7fa55a614bef92e Mon Sep 17 00:00:00 2001 From: Kou Wenqi -Date: Mon, 5 Aug 2024 14:35:06 +0800 -Subject: [PATCH] multipath: display the correct configuration when dumpping +Date: Tue, 13 Aug 2024 10:12:36 +0800 +Subject: [PATCH] multipath: display the correct configuration when dumping config "multipath -t" and "multipath -T" might show the wrong multipathd configuration items "retrigger_tries" and "force_sync". Make sure they don't. + +Signed-off-by: Kou Wenqi +Reviewed-by: Martin Wilck --- - multipath/main.c | 8 ++++++++ - 1 file changed, 8 insertions(+) + multipath/main.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/multipath/main.c b/multipath/main.c -index 3c5a70e..f52430f 100644 +index 65f2949..4853d17 100644 --- a/multipath/main.c +++ b/multipath/main.c -@@ -866,6 +866,8 @@ main (int argc, char *argv[]) - char *dev = NULL; - struct config *conf; - int retries = -1; -+ int retrigger_tries_ori; -+ int force_sync_ori; - - udev = udev_new(); - logsink = 0; -@@ -873,7 +875,9 @@ main (int argc, char *argv[]) +@@ -875,8 +875,6 @@ main (int argc, char *argv[]) if (!conf) exit(RTVL_FAIL); multipath_conf = conf; -+ retrigger_tries_ori = conf->retrigger_tries; - conf->retrigger_tries = 0; -+ force_sync_ori = conf->force_sync; - conf->force_sync = 1; +- conf->retrigger_tries = 0; +- conf->force_sync = 1; while ((arg = getopt(argc, argv, ":adcChl::FfM:v:p:b:BrR:itTquUwW")) != EOF ) { switch(arg) { -@@ -944,10 +948,14 @@ main (int argc, char *argv[]) - conf->find_multipaths = FIND_MULTIPATHS_GREEDY; - break; - case 't': -+ conf->retrigger_tries = retrigger_tries_ori; -+ conf->force_sync = force_sync_ori; - r = dump_config(conf, NULL, NULL) ? RTVL_FAIL : RTVL_OK; - goto out_free_config; - case 'T': - cmd = CMD_DUMP_CONFIG; -+ conf->retrigger_tries = retrigger_tries_ori; -+ conf->force_sync = force_sync_ori; - break; - case 'h': - usage(argv[0]); + case 1: printf("optarg : %s\n",optarg); +@@ -1017,6 +1015,11 @@ main (int argc, char *argv[]) + + libmp_udev_set_sync_support(1); + ++ if (cmd != CMD_DUMP_CONFIG) { ++ conf->retrigger_tries = 0; ++ conf->force_sync = 1; ++ } ++ + if (init_checkers(conf->multipath_dir)) { + condlog(0, "failed to initialize checkers"); + goto out; -- 2.27.0 diff --git a/multipath-tools.spec b/multipath-tools.spec index a7d74d03dc92b5a1585507b59164a7a05b01081f..41bffd94175a241fec246e064a5bfac9bb76d0c8 100644 --- a/multipath-tools.spec +++ b/multipath-tools.spec @@ -2,7 +2,7 @@ Name: multipath-tools Version: 0.8.4 -Release: 29 +Release: 30 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/ @@ -210,6 +210,9 @@ fi %changelog +* Tue Aug 27 2024 kouwenqi - 0.8.4-30 +- sync patch50 with community + * Wed Aug 21 2024 Jiaming Zhang - 0.8.4-29 - Added 'Buildarch:noarch' to the help subpackage