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

overlay: Tweak coreos-boot-mount-generator to deal with older RHCOS #219

Merged
merged 1 commit into from
Nov 7, 2019

Conversation

cgwalters
Copy link
Member

I was debugging a customer's test system that was installed as
OpenShift 4.2 and then upgraded, and noticed rpm-ostreed wasn't
starting on reboot, which was because /boot wasn't mounted,
which was because the systemd-fstab-generator and this code
had actually raced and generated a corrupted /run/systemd/boot.mount.

Tweak this code so it cleanly exits and defers to systemd-fstab-generator
for RHCOS-4.2 or older systems.

@cgwalters
Copy link
Member Author

I tested this didn't break FCOS, but didn't test RHCOS with it yet because doing so on latest pulls in 52dd9db which in turn requires coreos/ignition-dracut#132

@cgwalters
Copy link
Member Author

cgwalters commented Nov 6, 2019

Update: tested a 4.2 ➡️ 4.3 upgrade (by rebasing this commit on one before 52dd9db) and confirmed this fixes the bug.

@cgwalters
Copy link
Member Author

And yes, this is some RHCOS specifics in the FCOS config, but it's hard to get a cleaner solution - we're going to get some of these types of bits when the projects are sharing code. This one is pretty minimal.

(Perhaps at some point we could teach the MCO or RHCOS to migrate /boot out of /etc/fstab and be able to drop this, but...not trivial)

I was debugging a customer's test system that was installed as
OpenShift 4.2 and then upgraded, and noticed rpm-ostreed wasn't
starting on reboot, which was because `/boot` wasn't mounted,
which was because the `systemd-fstab-generator` and this code
had actually raced and generated a corrupted `/run/systemd/boot.mount`.

Tweak this code so it cleanly exits and defers to systemd-fstab-generator
for RHCOS-4.2 or older systems.
@cgwalters
Copy link
Member Author

Tweaked this to just test for the aleph version, since it's the cleanest and most accurate test.

Copy link
Member

@miabbott miabbott left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense to me!

@jlebon
Copy link
Member

jlebon commented Dec 5, 2019

Likely regression in coreos/fedora-coreos-tracker#322.

@jlebon
Copy link
Member

jlebon commented Dec 5, 2019

Any reason we're not just checking /etc/fstab here?

@jlebon
Copy link
Member

jlebon commented Dec 5, 2019

Follow-up to this here: #247

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

3 participants