Skip to content

Commit a247d2b

Browse files
mwilckjohannbg
authored andcommitted
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.
1 parent 371b338 commit a247d2b

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed
+6-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
[Unit]
22
Description=Device-Mapper Multipath Device Controller
33
Before=iscsi.service iscsid.service lvm2-activation-early.service
4-
Wants=local-fs-pre.target
5-
Before=local-fs-pre.target
4+
Before=local-fs-pre.target blk-availability.service shutdown.target
65
Wants=systemd-udevd-kernel.socket
76
After=systemd-udevd-kernel.socket
7+
After=multipathd.socket systemd-remount-fs.service
88
Before=initrd-cleanup.service
99
DefaultDependencies=no
1010
Conflicts=shutdown.target
@@ -13,13 +13,16 @@ ConditionKernelCommandLine=!nompath
1313
ConditionKernelCommandLine=!rd.multipath=0
1414
ConditionKernelCommandLine=!rd_NO_MULTIPATH
1515
ConditionKernelCommandLine=!multipath=off
16+
ConditionVirtualization=!container
1617

1718
[Service]
1819
Type=notify
1920
NotifyAccess=main
2021
ExecStartPre=-/sbin/modprobe dm-multipath
21-
ExecStart=/sbin/multipathd -s -d
22+
ExecStart=/sbin/multipathd -d -s
2223
ExecReload=/sbin/multipathd reconfigure
24+
TasksMax=infinity
2325

2426
[Install]
2527
WantedBy=sysinit.target
28+
Also=multipathd.socket

0 commit comments

Comments
 (0)