72c1204567
Now mdcheck service can't be run successfully. We need to put mdcheck in to the right place (/usr/share/mdadm/mdcheck) and it needs to remove the dependency of mdadm_env.sh which is fixed in patch 76c224c6c. And there is a history problem. It needed KillMode=none before, so it removed the upstream patch 52c67fcdd. Now this problem has been fixed, so we can do the backport more easilly now. We don't need to remove the upstream patch here again. It adds a rhel only feature too for transient failure. Resolves: rhbz#2159923, rhbz#2150865, rhbz#2124071, rhbz#2203859 Signed-off-by: Xiao Ni <xni@redhat.com>
48 lines
1.2 KiB
Diff
48 lines
1.2 KiB
Diff
From d39fd87e31024804dd7f2c16c03af0379b71f5f1 Mon Sep 17 00:00:00 2001
|
|
From: NeilBrown <neilb@suse.de>
|
|
Date: Mon, 13 Mar 2023 14:42:58 +1100
|
|
Subject: [PATCH 108/125] mdmon: don't test both 'all' and 'container_name'.
|
|
|
|
If 'all' is not set, then container_name must be NULL, as nothing else
|
|
can set it. So simplify the test to ignore container_name.
|
|
This makes the purpose of the code more obvious.
|
|
|
|
Signed-off-by: NeilBrown <neilb@suse.de>
|
|
Signed-off-by: Jes Sorensen <jes@trained-monkey.org>
|
|
---
|
|
mdmon.c | 11 ++++-------
|
|
1 file changed, 4 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/mdmon.c b/mdmon.c
|
|
index 60ba3182..f8fd2f0f 100644
|
|
--- a/mdmon.c
|
|
+++ b/mdmon.c
|
|
@@ -352,7 +352,6 @@ int main(int argc, char *argv[])
|
|
}
|
|
}
|
|
|
|
-
|
|
if (in_initrd()) {
|
|
/*
|
|
* set first char of argv[0] to @. This is used by
|
|
@@ -362,12 +361,10 @@ int main(int argc, char *argv[])
|
|
argv[0][0] = '@';
|
|
}
|
|
|
|
- if (all == 0 && container_name == NULL) {
|
|
- if (argv[optind]) {
|
|
- container_name = get_md_name(argv[optind]);
|
|
- if (!container_name)
|
|
- return 1;
|
|
- }
|
|
+ if (!all && argv[optind]) {
|
|
+ container_name = get_md_name(argv[optind]);
|
|
+ if (!container_name)
|
|
+ return 1;
|
|
}
|
|
|
|
if (container_name == NULL || argc - optind > 1)
|
|
--
|
|
2.38.1
|
|
|