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.

Sign up for GitHub

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

Jump to bottom

coreos-boot-mount-generator: key off of /etc/fstab #247

Merged
merged 1 commit into from
Dec 6, 2019
Merged

coreos-boot-mount-generator: key off of /etc/fstab #247

merged 1 commit into from
Dec 6, 2019

Conversation

jlebon
Copy link
Member

@jlebon jlebon commented Dec 5, 2019 •
edited

Just look at /etc/fstab for /boot mounts to determine whether to
generate them ourselves or let the systemd-fstab-generator do it.

See also: coreos/fedora-coreos-tracker#322

@jlebon
Copy link
Member Author

jlebon commented Dec 5, 2019

(Still need to test this.)

@jlebon jlebon mentioned this pull request Dec 5, 2019
Merged
@cgwalters
Copy link
Member

Hm, sorry about this, I certainly didn't even think at all about really old FCOS.

Change seems reasonable to me as a better "detect build from Anaconda", but I think we can do better, and it's the same solution as we've been using in RHCOS, which is to key off of the root= kernel argument.

@jlebon
Copy link
Member Author

jlebon commented Dec 5, 2019

Change seems reasonable to me as a better "detect build from Anaconda", but I think we can do better, and it's the same solution as we've been using in RHCOS, which is to key off of the root= kernel argument.

Hmm, I think it's cleaner/more obviously correct to key off the thing we actually care about though. In this case, it's whether we need to emit boot mounts or whether systemd-fstab-generator will take care of it for us.

@cgwalters
Copy link
Member

Sure, that's fine by me too.

@jlebon jlebon marked this pull request as ready for review December 5, 2019 15:57
@jlebon
Copy link
Member Author

jlebon commented Dec 5, 2019

OK, tested working from a node that started at 30.20190905.0 (which didn't have .coreos-aleph-version.json). Upgraded to the barrier, then to this. /boot still being generated.

cgwalters
cgwalters approved these changes Dec 5, 2019
View reviewed changes
Copy link
Member

@cgwalters cgwalters left a comment

Choose a reason for hiding this comment

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

Two nits otherwise LGTM.

overlay.d/05core/usr/lib/systemd/system-generators/coreos-boot-mount-generator Outdated Show resolved Hide resolved
overlay.d/05core/usr/lib/systemd/system-generators/coreos-boot-mount-generator Show resolved Hide resolved
@jlebon
coreos-boot-mount-generator: key off of /etc/fstab
f098fcb 
Just look at `/etc/fstab` for `/boot` mounts to determine whether to
generate them ourselves or let the `systemd-fstab-generator` do it.

See also: coreos/fedora-coreos-tracker#322
@jlebon jlebon merged commit a99daff into coreos:testing-devel Dec 6, 2019
@jlebon jlebon mentioned this pull request Dec 6, 2019
Closed
@cgwalters cgwalters mentioned this pull request Dec 20, 2019
Merged
@cgwalters cgwalters mentioned this pull request Mar 18, 2020
Merged
@jlebon jlebon deleted the pr/use-fstab branch April 23, 2023 23:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cgwalters cgwalters cgwalters approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@jlebon @cgwalters