In env-ddf-template, it uses MDADM_NO_SYSTEMCTL=1. But in
continue_via_systemd it returns MDADM_STATUS_SUCCESS, so
mdadm doesn't start mdmon itself.
Signed-off-by: Xiao Ni <xni@xxxxxxxxxx>
---
tests/10ddf-create.broken | 5 -----
tests/10ddf-fail-two-spares.broken | 5 -----
util.c | 2 +-
3 files changed, 1 insertion(+), 11 deletions(-)
delete mode 100644 tests/10ddf-create.broken
delete mode 100644 tests/10ddf-fail-two-spares.broken
diff --git a/tests/10ddf-create.broken b/tests/10ddf-create.broken
deleted file mode 100644
index 0f7d25e5b120..000000000000
--- a/tests/10ddf-create.broken
+++ /dev/null
@@ -1,5 +0,0 @@
-Fails due to segmentation fault at assemble.
-
-Too much effort to diagnose this now, marking as broken to make CI clear.
- ++ /usr/sbin/mdadm -A /dev/md/ddf0 /dev/loop8 /dev/loop9 /dev/loop10 /dev/loop11 /dev/loop12
- ./test: line 76: 101955 Segmentation fault (core dumped) $mdadm "$@" 2> $targetdir/stderr
diff --git a/tests/10ddf-fail-two-spares.broken b/tests/10ddf-fail-two-spares.broken
deleted file mode 100644
index eeea56d989ff..000000000000
--- a/tests/10ddf-fail-two-spares.broken
+++ /dev/null
@@ -1,5 +0,0 @@
-fails infrequently
-
-Fails roughly 1 in 3 with error:
-
- ERROR: /dev/md/vol1 should be optimal in meta data
diff --git a/util.c b/util.c
index 8c45f0e1feaf..9fe2d2276712 100644
--- a/util.c
+++ b/util.c
@@ -2310,7 +2310,7 @@ mdadm_status_t continue_via_systemd(char *devnm, char *service_name, char *prefi
dprintf("Start %s service\n", service_name);
/* Simply return that service cannot be started */
if (check_env("MDADM_NO_SYSTEMCTL"))
- return MDADM_STATUS_SUCCESS;
+ return MDADM_STATUS_ERROR;
/* Fork in attempt to start services */
switch (fork()) {
--
2.32.0 (Apple Git-132)
