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

ostree-ext: Serialize xattrs into tar stream as well #1032

Merged
merged 2 commits into from
Jan 16, 2025

Conversation

cgwalters
Copy link
Collaborator

We really want this for coreos/rpm-ostree#5222
to be able to rebuild images from their container-synthesized rootfs.

Really, the only xattr we don't want to emit in to the tar stream
is security.selinux for now.

Eventually we should try to switch to putting that into the tar
stream too, but it needs more validation.

Signed-off-by: Colin Walters [email protected]

Prep for next patch.

Signed-off-by: Colin Walters <[email protected]>
@cgwalters cgwalters marked this pull request as ready for review January 16, 2025 01:50
Copy link
Member

@jmarrero jmarrero left a comment

Choose a reason for hiding this comment

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

lgtm

@cgwalters
Copy link
Collaborator Author

Interesting. The unit tests passed in GHA, but failed in copr. Need to dig into that...

@cgwalters cgwalters force-pushed the export-xattrs branch 2 times, most recently from 4cb29b5 to f61c38d Compare January 16, 2025 19:23
@cgwalters
Copy link
Collaborator Author

No idea what's up with the unit tests in COPR but I added some code to dump the filesystem tree if the checksum doesn't match

@cgwalters
Copy link
Collaborator Author

cgwalters commented Jan 16, 2025

Ah hah! It's just c{9,10}s failing because those have ostree-2024.10 which has ostreedev/ostree#3346 which sorts xattrs. I need to fix our test suite to do that too.

Edit: Done ✔️

We really want this for coreos/rpm-ostree#5222
to be able to rebuild images from their container-synthesized rootfs.

Really, the only xattr we don't want to emit in to the tar stream
is security.selinux for now.

Eventually we should try to switch to putting that into the tar
stream too, but it needs more validation.

Signed-off-by: Colin Walters <[email protected]>
@cgwalters cgwalters enabled auto-merge January 16, 2025 21:01
@cgwalters cgwalters merged commit 2aed31d into containers:main Jan 16, 2025
25 checks passed
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