Skip to content

Fix 253 replace directory - #265

Merged
rnc merged 2 commits into
goldmann:mainfrom
rnc:fix-253-replace-directory
Nov 10, 2026
Merged

rnc merged 2 commits into
goldmann:mainfrom
rnc:fix-253-replace-directory

Conversation

@rnc

@rnc rnc commented Nov 10, 2026 •

Copy link
Copy Markdown
Collaborator

Cherry picked the code from commit c4d6f7a (manually not the entire commit) and #254

Fixes #253

Nixxx11 and others added 2 commits November 10, 2026 11:10
(cherry picked from commit c4d6f7a)
When a directory was replaced by a file or link in a newer layer, files
(and whiteout markers) from older layers below that path were still copied
into the squashed layer. The result has a regular file with children, which
the daemon rejects when creating a container.

Track the non-directory paths added to the squashed tar and skip older
entries beneath them, including markers scheduled for re-adding.

Fixes goldmann#253
@rnc
rnc force-pushed the fix-253-replace-directory branch from 8c5c193 to 95b1edc Compare November 10, 2026 11:11
@rnc
rnc merged commit f92ad47 into goldmann:main Nov 10, 2026
32 checks passed
@rnc
rnc deleted the fix-253-replace-directory branch November 10, 2026 11:38
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.

Replacing directory with a regular file breaks squashing

3 participants