Skip to content
This repository was archived by the owner on Jan 15, 2025. It is now read-only.

ostree-ext/tar/export: Fix reexport of var/tmp#683

Closed
cgwalters wants to merge 1 commit intoostreedev:mainfrom
cgwalters:fix-vartmp
Closed

ostree-ext/tar/export: Fix reexport of var/tmp#683
cgwalters wants to merge 1 commit intoostreedev:mainfrom
cgwalters:fix-vartmp

Conversation

@cgwalters
Copy link
Member

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 have var/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.

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 have `var/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.
@cgwalters
Copy link
Member Author

OK planning to do coreos/rpm-ostree#5227 instead, so we'll keep this repo archived.

@cgwalters cgwalters closed this Jan 15, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant