From a247d2bc0d4c6d37a2ea4f3da98dd7902bb37385 Mon Sep 17 00:00:00 2001 From: Martin Wilck Date: Tue, 7 Dec 2021 17:59:25 +0100 Subject: [PATCH] fix(multipathd.service): adapt to upstream multipath-tools unit file In the long run, it's desirable to be able to drop dracut's copy of multipathd.service and use the upstream one from multipath-tools instead. This patch makes a step in that direction. With these changes, the only remaining difference is the support for rd.multipath=0 and rd_NO_MULTIPATH, which must obviously be ignored in the upstream unit. The modifications in this patch are minor and will have no effect in the initramfs. --- modules.d/90multipath/multipathd.service | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/modules.d/90multipath/multipathd.service b/modules.d/90multipath/multipathd.service index a09e0c4e3f..4029a81e51 100644 --- a/modules.d/90multipath/multipathd.service +++ b/modules.d/90multipath/multipathd.service @@ -1,10 +1,10 @@ [Unit] Description=Device-Mapper Multipath Device Controller Before=iscsi.service iscsid.service lvm2-activation-early.service -Wants=local-fs-pre.target -Before=local-fs-pre.target +Before=local-fs-pre.target blk-availability.service shutdown.target Wants=systemd-udevd-kernel.socket After=systemd-udevd-kernel.socket +After=multipathd.socket systemd-remount-fs.service Before=initrd-cleanup.service DefaultDependencies=no Conflicts=shutdown.target @@ -13,13 +13,16 @@ ConditionKernelCommandLine=!nompath ConditionKernelCommandLine=!rd.multipath=0 ConditionKernelCommandLine=!rd_NO_MULTIPATH ConditionKernelCommandLine=!multipath=off +ConditionVirtualization=!container [Service] Type=notify NotifyAccess=main ExecStartPre=-/sbin/modprobe dm-multipath -ExecStart=/sbin/multipathd -s -d +ExecStart=/sbin/multipathd -d -s ExecReload=/sbin/multipathd reconfigure +TasksMax=infinity [Install] WantedBy=sysinit.target +Also=multipathd.socket