fix rootfs propagation mode to shared / unbindable #4724
+49
−0
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
Signed-off-by: Yusuke Sakurai <[email protected]>
AkihiroSuda
reviewed
Apr 16, 2025
| # Set rootfsPropagation to shared | ||
| update_config ' .linux.rootfsPropagation = "shared" ' | ||
|
|
||
| update_config ' .process.args = ["sh", "-c", "findmnt --noheadings -o PROPAGATION /"] ' |
There was a problem hiding this comment.
No need to wrap findmnt in sh
AkihiroSuda
reviewed
Apr 16, 2025
| } | ||
|
|
||
| @test "runc run [rootfsPropagation shared]" { | ||
| # Set rootfsPropagation to shared |
There was a problem hiding this comment.
This is obvious from the code and does not need to be explained in a code comment line
AkihiroSuda
reviewed
Apr 16, 2025
| # Run the container and capture the output | ||
| runc run test_shared_rootfs | ||
| [ "$status" -eq 0 ] | ||
| [[ "$output" == *"shared"* ]] |
There was a problem hiding this comment.
Suggested change
| [[ "$output" == *"shared"* ]] | |
| [ "$output" == "shared" ] |
AkihiroSuda
reviewed
Apr 16, 2025
| @@ -232,6 +236,27 @@ func prepareRootfs(pipe *syncSocket, iConfig *initConfig) (err error) { | |||
| return nil | |||
| } | |||
|
|
|||
| // adjustRootMountPropagation applies mount propagation flags such as MS_SHARED or MS_UNBINDABLE | |||
| // to the root mount after the pivot_root or chroot has taken place. | |||
There was a problem hiding this comment.
Needs a comment to explain why this cannot be done in prepareRoot:
runc/libcontainer/rootfs_linux.go
Lines 1012 to 1027 in 3d8a278
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 PR adds support for applying mount propagation settings (MS_SHARED or MS_UNBINDABLE) to the container root based on the value of config.RootPropagation.
We apply mount propagation after executing pivot_root and rootfsParentMountPrivate
Fixes #1755
Related:
#1815
youki-dev/youki#3141
Signed-off-by: Yusuke Sakurai [email protected]