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

35coreos-ignition: move ignition-setup-user.service here #1095

Merged
merged 4 commits into from
Jul 9, 2021
Merged

35coreos-ignition: move ignition-setup-user.service here #1095

merged 4 commits into from
Jul 9, 2021

Conversation

bgilbert
Copy link
Contributor

@bgilbert bgilbert commented Jul 8, 2021

The service contains distro-specific assumptions, so move it out of the upstream Ignition repo.

coreos/ignition#1248 removes the service upstream. For more context, see coreos/ignition#1246 (comment).

bgilbert added 4 commits July 8, 2021 17:28
Upstream Ignition can't assume is-live-image exists, because the distro
may not have provided it.  But we know the coreos-live module is providing
it, so drop the check.
The service contains distro-specific assumptions, so move it out of the
upstream Ignition repo.  This commit is a straight `cp`.
The fetch-offline stage now exists and runs before fetch, so update the
dep.  This shouldn't be a functional change.
Copy link
Member

@jlebon jlebon left a comment

Choose a reason for hiding this comment

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

Nice!

if is-live-image; then
# Live image. If the user has supplied a config.ign via an appended
# initrd, put it in the right place.
copy_file_if_exists "/config.ign" "${destination}/user.ign"
Copy link
Member

Choose a reason for hiding this comment

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

Hmm, I guess this bit could live in the live generator now. And then the service would be pulled in by diskful.target directly and e.g. we could hardcode the various Requires that are currently dynamic. OTOH, it's nice to have everything related to the Ignition config centralized, so... meh, maybe not worth it.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Yeah, I'm on the fence too. Leaving alone for now.

@bgilbert bgilbert merged commit f124289 into coreos:testing-devel Jul 9, 2021
@bgilbert bgilbert deleted the setup-user/testing-devel branch July 9, 2021 17:11
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.

2 participants