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

Revert "compose: Inject our static tmpfiles.d dropins earlier" #4881

Merged
merged 2 commits into from
Mar 21, 2024

Conversation

cgwalters
Copy link
Member

This reverts commit e1e78cf.

It breaks idempotency with osbuild.

Closes: #4879

This reverts commit e1e78cf.

It breaks idempotency with osbuild.

Closes: coreos#4879
@cgwalters
Copy link
Member Author

Didn't test this locally; presumably this will break the stateoverlay testing, which we would also probably need to unwind.

@alexlarsson
Copy link
Collaborator

Yeah, you probably need to revert fde9e9e as well

@ericcurtin
Copy link
Contributor

ericcurtin commented Mar 21, 2024

I tested practically the same change and it seemed to fix things, but just in case I'm running a build on this branch locally one more time

@cgwalters
Copy link
Member Author

Yeah, you probably need to revert fde9e9e as well

I kind of hope so yes...yeah, might as well go ahead and do that too now

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.

LGTM.

Yes, definitely will need to revert fde9e9e as well which will fail without this.

@jlebon
Copy link
Member

jlebon commented Mar 21, 2024

I think the actual fix for this is to make the autovar.conf generator run in postprocessing when doing base composes instead of during assembly.

@cgwalters cgwalters force-pushed the postprocess-idempotent branch from 2d720a0 to 8f176e8 Compare March 21, 2024 15:17
@cgwalters
Copy link
Member Author

I think the actual fix for this is to make the autovar.conf generator run in postprocessing when doing base composes instead of during assembly.

Yeah...I started looking/thinking about this but the complexity is really high, and we probably need to add the osbuild testing to have some confidence right?

@jlebon
Copy link
Member

jlebon commented Mar 21, 2024

I think the actual fix for this is to make the autovar.conf generator run in postprocessing when doing base composes instead of during assembly.

Yeah...I started looking/thinking about this but the complexity is really high, and we probably need to add the osbuild testing to have some confidence right?

Yup, sure. I still think we should revert for now.

@ericcurtin
Copy link
Contributor

This passed the AutoSD build locally on my machine

@cgwalters cgwalters enabled auto-merge (rebase) March 21, 2024 15:28
@jlebon
Copy link
Member

jlebon commented Mar 21, 2024

But actually, as per what we discussed in ostreedev/ostree-rs-ext#607 (comment), we don't need to support turning it on in base composes anyway. I'll open a follow up to this that removes it.

@cgwalters cgwalters merged commit 10d3d98 into coreos:main Mar 21, 2024
17 checks passed
@alexlarsson
Copy link
Collaborator

Can we also get a new fedora/cs9 release with these changes? Either as backported patches or a new release.

@cgwalters

This comment was marked as outdated.

@cgwalters
Copy link
Member Author

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.

Automotive Stream Distribution builds failing
4 participants