diff options
| -rw-r--r-- | test/test-functions | 4 | ||||
| -rwxr-xr-x | test/units/testsuite-64.sh | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/test-functions b/test/test-functions index b2a83f155b..f613dc215d 100644 --- a/test/test-functions +++ b/test/test-functions @@ -1289,6 +1289,10 @@ install_mdadm() { for unit in "${mdadm_units[@]}"; do image_install "${ROOTLIBDIR:?}/$unit" done + + # Disable the mdmonitor service, since it fails if there's no valid email address + # configured in /etc/mdadm.conf, which just unnecessarily pollutes the logs + "${SYSTEMCTL:?}" mask --root "${initdir:?}" mdmonitor.service || : } install_compiled_systemd() { diff --git a/test/units/testsuite-64.sh b/test/units/testsuite-64.sh index 0e598cc6b3..81edb0ab7a 100755 --- a/test/units/testsuite-64.sh +++ b/test/units/testsuite-64.sh @@ -1159,10 +1159,6 @@ testcase_mdadm_lvm() { helper_check_device_units } -# Disable the mdmonitor service, since it fails if there's no valid email address -# configured in /etc/mdadm.conf, which just unnecessarily pollutes the logs -systemctl list-unit-files mdmonitor.service >/dev/null && systemctl mask --runtime mdmonitor.service - udevadm settle udevadm control --log-level debug lsblk -a |