Skip to content

pkg/archive/overlayWhiteoutConverter.ConvertWrite(): force mode to 0#1196

Merged
vrothberg merged 1 commit intocontainers:mainfrom
nalind:overlay-whiteout-mode
Apr 12, 2022
Merged

pkg/archive/overlayWhiteoutConverter.ConvertWrite(): force mode to 0#1196
vrothberg merged 1 commit intocontainers:mainfrom
nalind:overlay-whiteout-mode

Conversation

@nalind
Copy link
Copy Markdown
Member

@nalind nalind commented Apr 11, 2022

Force the mode for whiteouts that have been converted from overlay format (produced by overlay native diff) to aufs format to 0x0, to match the permissions we assign to whiteouts we create when using naive diff.

Fixes #1195.

Force the mode for whiteouts that have been converted from overlay
format (produced by overlay native diff) to aufs format to 0x0, to match
the permissions we assign to whiteouts we create when using naive diff.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
@rhatdan
Copy link
Copy Markdown
Member

rhatdan commented Apr 11, 2022

LGTM,

I take it this will still work fine in rootless mode.

@giuseppe @vrothberg @saschagrunert PTAL

@nalind
Copy link
Copy Markdown
Member Author

nalind commented Apr 11, 2022

It's not a difference between rootful and rootless so much as a difference between native vs naive diff (on my system, root uses naive diff because CONFIG_OVERLAY_FS_REDIRECT_DIR is detected, while that isn't detected for me, so I get to use native diff), so yes.

@flouthoc
Copy link
Copy Markdown
Collaborator

flouthoc commented Apr 11, 2022

I've been trying to reproduce the issue to test diff but i don't see the whiteout files in the exported tar, @nalind should i switch to naive diff ?

@flouthoc
Copy link
Copy Markdown
Collaborator

Please ignore my above comment, discussed it with @nalind.

Copy link
Copy Markdown
Collaborator

@flouthoc flouthoc left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Copy Markdown
Member

@vrothberg vrothberg left a comment

Choose a reason for hiding this comment

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

LGTM

@vrothberg vrothberg merged commit ea4008e into containers:main Apr 12, 2022
@nalind nalind deleted the overlay-whiteout-mode branch April 12, 2022 12:40
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.

Image which moves symlink aside and then adds file built with rootless container upsets k3s ctr images import

4 participants