Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[rhcos-4.15] overlays: drop coreos-multipath-trigger.service #3028

Merged
merged 1 commit into from
Jun 18, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
overlays: drop coreos-multipath-trigger.service
This service was needed in the past to make multipath + LUKS work well.
The underlying bug seems to have been fixed now as I can no longer
reproduce it in Fedora or RHEL 9.4. Conveniently, this also works around
a bug in which that service would sometimes hang because of a bug[[1]]
in systemd which is still outstanding in RHEL 9.

Drop it.

We don't have any tests for this yet. Multipath + LUKS currently doesn't
work but should be fixed soon[[2]]. A test will be added as part of
that work.

[1]: systemd/systemd#29863
[2]: coreos/fedora-coreos-tracker#1728

Fixes: https://issues.redhat.com/browse/OCPBUGS-29325
(cherry picked from commit cc2e865)
  • Loading branch information
jlebon committed Jun 17, 2024
commit d82ac00d53c8d348c9f257c81c6c08eae8521086
Original file line number Diff line number Diff line change
Expand Up @@ -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

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,4 @@ OnFailureJobMode=isolate
# already have our multipath target.
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
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}