From 7adf6ce3ca98992cfcfc34c9024c683e1958746c Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Wed, 15 Jan 2025 20:34:30 +0900 Subject: [PATCH] mkosi: disable multipathd by default Hopefully fixes #36008. --- .../usr/lib/systemd/system-preset/00-mkosi.preset | 11 +++++++++++ 1 file changed, 11 insertions(+) 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 269692b646a..6fc4297fe31 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 -- 2.47.3