Nothing Special   »   [go: up one dir, main page]

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

[1.2] Post overlay addition and dmz removal nits #4494

Merged
merged 3 commits into from
Nov 1, 2024

Conversation

kolyshkin
Copy link
Contributor

This is a backport of #4490 to release-1.2 branch.


Tiny nits needed after merging #4482 and #4448. Easy to review.

@kolyshkin kolyshkin added easy-to-review backport/1.2-pr A backport PR to release-1.2 labels Oct 30, 2024
@kolyshkin kolyshkin added this to the 1.2.1 milestone Oct 30, 2024
@lifubang
Copy link
Member

If you use ‘git cherry-pick -s -x’ to add the original commit id, it will be more better.

@rata
Copy link
Member
rata commented Nov 1, 2024

These do apply without conflicts to 1.2 branch, please use charry-pick -x -s

@rata rata mentioned this pull request Nov 1, 2024
@kolyshkin
Copy link
Contributor Author

If you use ‘git cherry-pick -s -x’ to add the original commit id, it will be more better.

right; done; ptal

While this is used by the majority of upper container runtimes, it was
not needed for runc itself. Since commit 515f09f runc uses overlay,
too, so let's add a check for this.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit ee1bced)
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
There is a typo in the comment (ClonedBinary should be CloneBinary), and
the code has changed a bit since then, and it makes more sense to refer
to CloneSelfExe now.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit 8cc7375)
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
This was added by commit f2f1621 when runc-dmz was still a thing.

Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
(cherry picked from commit 5586d7c)
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Copy link
Member
@rata rata left a comment

Choose a reason for hiding this comment

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

LGTM

@rata rata merged commit 360f8f9 into opencontainers:release-1.2 Nov 1, 2024
40 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/1.2-pr A backport PR to release-1.2 easy-to-review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants