libcontainer/specconv/spec_linux: Support empty 'type' for bind mounts#1753
Merged
crosbymichael merged 1 commit intoopencontainers:masterfrom Apr 16, 2018
Merged
Conversation
wking
force-pushed
the
do-not-require-bind-mount-type
branch
from
5e73b68 to
060f9a3
Compare
Member
|
Looks okay, probably needs a test though. And I think |
wking
force-pushed
the
do-not-require-bind-mount-type
branch
from
060f9a3 to
bc225e7
Compare
Contributor
Author
What sort of test were you looking for? An integration test? Something in |
Member
An integration test would be nice, but if that's too overkill for simply testing bind-mounts, then a |
wking
force-pushed
the
do-not-require-bind-mount-type
branch
3 times, most recently
from
ad8781b to
0aa6e4e
Compare
From the "Creating a bind mount" section of mount(2) [1]: > If mountflags includes MS_BIND (available since Linux 2.4), then > perform a bind mount... > > The filesystemtype and data arguments are ignored. This commit adds support for configurations that leave the OPTIONAL type [2] unset for bind mounts. There's a related spec-example change in flight with [3], although my personal preference would be a more explicit spec for the whole mount structure [4]. [1]: http://man7.org/linux/man-pages/man2/mount.2.html [2]: https://github.com/opencontainers/runtime-spec/blame/v1.0.1/config.md#L102 [3]: opencontainers/runtime-spec#954 [4]: opencontainers/runtime-spec#771 Signed-off-by: W. Trevor King <wking@tremily.us>
Contributor
Author
Member
|
LGTM. |
Member
|
LGTM |
alban
reviewed
Jul 18, 2018
| source := m.Source | ||
| if m.Type == "bind" { | ||
| device := m.Type | ||
| if flags|unix.MS_BIND != 0 { |
Contributor
There was a problem hiding this comment.
This test is always true.
This should be:
if flags&unix.MS_BIND != 0 {
(& vs |)
This is causing opencontainers/runtime-tools#651
I'll prepare a PR.
/cc @dongsupark
alban
added a commit
to kinvolk/runc
that referenced
this pull request
Jul 18, 2018
PR opencontainers#1753 introduced a test on the mount flags but the binary operator was wrong, see opencontainers#1753 (comment) This was noticed when investigating opencontainers/runtime-tools#651 Symptoms: in the container, /proc/self/mountinfo displays some mounts as follow: 296 279 0:67 / /tmp rw,nosuid - tmpfs /home/dpark/go/src/github.com/opencontainers/runc/tmpfs rw,size=65536k,mode=755 Signed-off-by: Alban Crequy <alban@kinvolk.io>
This was referenced Apr 8, 2019
dims
pushed a commit
to dims/libcontainer
that referenced
this pull request
Oct 19, 2024
PR #1753 introduced a test on the mount flags but the binary operator was wrong, see opencontainers/runc#1753 (comment) This was noticed when investigating opencontainers/runtime-tools#651 Symptoms: in the container, /proc/self/mountinfo displays some mounts as follow: 296 279 0:67 / /tmp rw,nosuid - tmpfs /home/dpark/go/src/github.com/opencontainers/runc/tmpfs rw,size=65536k,mode=755 Signed-off-by: Alban Crequy <alban@kinvolk.io>
dims
pushed a commit
to dims/libcontainer
that referenced
this pull request
Oct 19, 2024
PR #1753 introduced a test on the mount flags but the binary operator was wrong, see opencontainers/runc#1753 (comment) This was noticed when investigating opencontainers/runtime-tools#651 Symptoms: in the container, /proc/self/mountinfo displays some mounts as follow: 296 279 0:67 / /tmp rw,nosuid - tmpfs /home/dpark/go/src/github.com/opencontainers/runc/tmpfs rw,size=65536k,mode=755 Signed-off-by: Alban Crequy <alban@kinvolk.io>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
From the “Creating a bind mount” section of
mount(2):This pull request adds support for configurations that leave the OPTIONAL
typeunset for bind mounts. There's a related spec-example change in flight with opencontainers/runtime-spec#954, although my personal preference would be a more explicit spec for the whole mount structure (opencontainers/runtime-spec#771).