This repository has been archived by the owner on Jan 15, 2025. It is now read-only.
ostree-ext/tar/export: Fix reexport of var/tmp #683
Closed
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A lot of technical debt here. A long time ago I added this hacky bit to inject var/tmp is the container stream even if it wasn't in the ostree commit.
Today things shipped by
rpm-ostree compose image
like FCOS don't havevar/tmp
in the commit.But then more recently we started shipping
/var/tmp
in base images directly.Now I'm working on coreos/rpm-ostree#5221 where we're rechunking from a rootfs that does have var/tmp and that ends up in the ostree commit.
The path comparison here was wrong because the tar stream we generate has the paths start with
./
and a literal comparison doesn't match./var/tmp
!=var/tmp
.Add a canonicalization helper and use it for this.