[1.2] Post overlay addition and dmz removal nits #4494
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
If you use ‘git cherry-pick -s -x’ to add the original commit id, it will be more better. |
|
These do apply without conflicts to 1.2 branch, please use charry-pick -x -s |
Merged
AkihiroSuda
approved these changes
Nov 1, 2024
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 <[email protected]> (cherry picked from commit ee1bced) Signed-off-by: Kir Kolyshkin <[email protected]>
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 <[email protected]> (cherry picked from commit 8cc7375) Signed-off-by: Kir Kolyshkin <[email protected]>
This was added by commit f2f1621 when runc-dmz was still a thing. Signed-off-by: Kir Kolyshkin <[email protected]> (cherry picked from commit 5586d7c) Signed-off-by: Kir Kolyshkin <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This is a backport of #4490 to release-1.2 branch.
Tiny nits needed after merging #4482 and #4448. Easy to review.