summaryrefslogtreecommitdiffstats
path: root/mkosi.extra.common
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2025-01-15 12:34:30 +0100
committerYu Watanabe <watanabe.yu+github@gmail.com>2025-01-15 16:57:07 +0100
commit7adf6ce3ca98992cfcfc34c9024c683e1958746c (patch)
treec5245dd193c81baa90bf4be72b12c375975afa5e /mkosi.extra.common
parentlogind: register PAM sessions via Varlink instead of D-Bus (#35264) (diff)
downloadsystemd-7adf6ce3ca98992cfcfc34c9024c683e1958746c.tar.xz
systemd-7adf6ce3ca98992cfcfc34c9024c683e1958746c.zip
mkosi: disable multipathd by default
Hopefully fixes #36008.
Diffstat (limited to 'mkosi.extra.common')
-rw-r--r--mkosi.extra.common/usr/lib/systemd/system-preset/00-mkosi.preset11
1 files changed, 11 insertions, 0 deletions
diff --git a/mkosi.extra.common/usr/lib/systemd/system-preset/00-mkosi.preset b/mkosi.extra.common/usr/lib/systemd/system-preset/00-mkosi.preset
index 269692b646..6fc4297fe3 100644
--- a/mkosi.extra.common/usr/lib/systemd/system-preset/00-mkosi.preset
+++ b/mkosi.extra.common/usr/lib/systemd/system-preset/00-mkosi.preset
@@ -41,3 +41,14 @@ disable iscsiuio.socket
disable selinux-autorelabel-mark.service
enable coverage-forwarder.service
+
+# Old multipathd.service pulls deprecated systemd-udev-settle.service, and it
+# may timeout on a slow CI environment. We manually start the service in
+# TEST-64-UDEV-STORAGE, hence it is not to necessary enable it by default.
+# Note, in the upstream, the dependency was removed by
+# https://github.com/opensvc/multipath-tools/commit/c9689b678f53a468be0af0b6fdcd0538ccf635cb
+disable multipathd.service
+
+# The socket unit is disabled by default in the upstream:
+# https://github.com/opensvc/multipath-tools/commit/346e9adda4e5f0ccfcbb7a3eccf5f96001d95027
+disable multipathd.socket