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.9] ignition-ostree-uuid-root.service: add stricter ordering #1527

Merged
merged 1 commit into from Feb 16, 2022

Conversation

jlebon
Copy link
Member

@jlebon jlebon commented Feb 16, 2022

In the multipath case, we're mounting
/dev/disk/by-label/dm-mpath-root, not by-label/root.

Also order against sysroot.mount because in the general case, there's
actually nothing that prevents the restamping to run at the same time as
the mount AFAICT if the root karg points to some other device path we
didn't predict.

See: openshift/os#683 (which hopefully this
fixes).

(cherry picked from commit 11a11bc)

In the multipath case, we're mounting
`/dev/disk/by-label/dm-mpath-root`, not `by-label/root`.

Also order against `sysroot.mount` because in the general case, there's
actually nothing that prevents the restamping to run at the same time as
the mount AFAICT if the `root` karg points to some other device path we
didn't predict.

See: openshift/os#683 (which hopefully this
fixes).

(cherry picked from commit 11a11bc)
@miabbott
Copy link
Member

Not sure the CI is going to meaningfully test this, so if you have tested it locally, then I'm OK with merging.

@jlebon
Copy link
Member Author

jlebon commented Feb 16, 2022

Tested locally and ran iso-install a bunch of times to be safe.

@jlebon jlebon merged commit 96217fd into coreos:rhcos-4.9 Feb 16, 2022
@jlebon jlebon deleted the pr/4.9-backport-11a11bcd branch February 16, 2022 17:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants