kernel
/
dracut
mirror of https://git.kernel.org/pub/scm/boot/dracut/dracut.git/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
master
Martin Wilck 2021-12-07 17:59:25 +01:00 committed by Jóhann B. Guðmundsson
parent 371b338a5f
commit a247d2bc0d
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules.d/90multipath/multipathd.service
View File

@ -1,10 +1,10 @@
[Unit] [Unit]
Description=Device-Mapper Multipath Device Controller Description=Device-Mapper Multipath Device Controller
Before=iscsi.service iscsid.service lvm2-activation-early.service Before=iscsi.service iscsid.service lvm2-activation-early.service
Wants=local-fs-pre.target Before=local-fs-pre.target blk-availability.service shutdown.target
Before=local-fs-pre.target
Wants=systemd-udevd-kernel.socket Wants=systemd-udevd-kernel.socket
After=systemd-udevd-kernel.socket After=systemd-udevd-kernel.socket
After=multipathd.socket systemd-remount-fs.service
Before=initrd-cleanup.service Before=initrd-cleanup.service
DefaultDependencies=no DefaultDependencies=no
Conflicts=shutdown.target Conflicts=shutdown.target
@ -13,13 +13,16 @@ ConditionKernelCommandLine=!nompath
ConditionKernelCommandLine=!rd.multipath=0 ConditionKernelCommandLine=!rd.multipath=0
ConditionKernelCommandLine=!rd_NO_MULTIPATH ConditionKernelCommandLine=!rd_NO_MULTIPATH
ConditionKernelCommandLine=!multipath=off ConditionKernelCommandLine=!multipath=off
ConditionVirtualization=!container


[Service] [Service]
Type=notify Type=notify
NotifyAccess=main NotifyAccess=main
ExecStartPre=-/sbin/modprobe dm-multipath ExecStartPre=-/sbin/modprobe dm-multipath
ExecStart=/sbin/multipathd -s -d ExecStart=/sbin/multipathd -d -s
ExecReload=/sbin/multipathd reconfigure ExecReload=/sbin/multipathd reconfigure
TasksMax=infinity


[Install] [Install]
WantedBy=sysinit.target WantedBy=sysinit.target
Also=multipathd.socket