summaryrefslogtreecommitdiffstats
path: root/test/test-functions
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2023-12-13 06:28:00 +0100
committerYu Watanabe <watanabe.yu+github@gmail.com>2023-12-13 06:28:03 +0100
commit0f236e8cd6309cdc392d9e62bc545dcd497a9c50 (patch)
tree4a57e33d33df21881f1c571ce56d51e46617e699 /test/test-functions
parenttest: make install_mdadm() also install relevant kernel modules (diff)
downloadsystemd-0f236e8cd6309cdc392d9e62bc545dcd497a9c50.tar.xz
systemd-0f236e8cd6309cdc392d9e62bc545dcd497a9c50.zip
test: mask mdmonitor when building image
Follow-up for 22e31655f3f9f54d932d4f48b92b36698e701729.
Diffstat (limited to 'test/test-functions')
-rw-r--r--test/test-functions4
1 files changed, 4 insertions, 0 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() {