diff --git a/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-multipath/coreos-multipath-generator b/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-multipath/coreos-multipath-generator index 7165620fb1..f073fee942 100755 --- a/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-multipath/coreos-multipath-generator +++ b/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-multipath/coreos-multipath-generator @@ -24,7 +24,4 @@ add_requires() { if getargbool 0 rd.multipath; then add_requires coreos-multipath-wait.target initrd.target - if ! getargbool 0 ignition.firstboot; then - add_requires coreos-multipath-trigger.service initrd.target - fi fi diff --git a/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-multipath/coreos-multipath-trigger.service b/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-multipath/coreos-multipath-trigger.service deleted file mode 100644 index 524dc9140e..0000000000 --- a/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-multipath/coreos-multipath-trigger.service +++ /dev/null @@ -1,19 +0,0 @@ -# This unit is needed in the LUKS-on-multipath case on subsequent boots. When -# multipathd takes ownership of the individual paths, the by-uuid/ symlink -# which systemd-cryptsetup@.service binds to gets lost. So we retrigger udev -# here to make sure it's re-added. -# -# This is tracked at: -# https://bugzilla.redhat.com/show_bug.cgi?id=1963242 - -[Unit] -Description=CoreOS Trigger Multipath -DefaultDependencies=false -Requires=coreos-multipath-wait.target -After=coreos-multipath-wait.target -Before=cryptsetup-pre.target - -[Service] -Type=oneshot -ExecStart=/usr/sbin/udevadm trigger --settle --subsystem-match block -RemainAfterExit=yes diff --git a/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-multipath/coreos-multipath-wait.target b/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-multipath/coreos-multipath-wait.target index e0fd500cd4..be624b4242 100644 --- a/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-multipath/coreos-multipath-wait.target +++ b/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-multipath/coreos-multipath-wait.target @@ -15,6 +15,4 @@ OnFailureJobMode=isolate # let's be more explicit and list it directly here too. Before=coreos-ignition-setup-user.service -# This is already enforced by coreos-multipath-trigger.service, though ideally -# eventually we can get rid of that one and then we *would* need this. Before=cryptsetup-pre.target diff --git a/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-multipath/module-setup.sh b/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-multipath/module-setup.sh index 92a33e7e3f..b04ba58e96 100755 --- a/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-multipath/module-setup.sh +++ b/overlay.d/05core/usr/lib/dracut/modules.d/35coreos-multipath/module-setup.sh @@ -23,6 +23,4 @@ install() { # we don't enable these; they're enabled dynamically via the generator inst_simple "$moddir/coreos-multipath-wait.target" \ "$systemdsystemunitdir/coreos-multipath-wait.target" - inst_simple "$moddir/coreos-multipath-trigger.service" \ - "$systemdsystemunitdir/coreos-multipath-trigger.service" }