diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-11-02 18:19:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-02 18:19:39 +0100 |
| commit | 8dfbdb561be5e2313dfa9f665e1f184089c8e967 (patch) | |
| tree | 5961684ec1483ee3fe45f40458d878e583e376ff /libpod | |
| parent | 7375a55757fe7615f133db5b097bb4db9a244888 (diff) | |
| parent | 3ee44d942ed9ed8f0b5e0ad1f1949d4b8ffa95f9 (diff) | |
| download | podman-8dfbdb561be5e2313dfa9f665e1f184089c8e967.tar.gz podman-8dfbdb561be5e2313dfa9f665e1f184089c8e967.tar.bz2 podman-8dfbdb561be5e2313dfa9f665e1f184089c8e967.zip | |
Merge pull request #8166 from rhatdan/unbindable
Allow users to mount with unbindable flag
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/container_inspect.go | 2 | ||||
| -rw-r--r-- | libpod/container_internal_linux.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libpod/container_inspect.go b/libpod/container_inspect.go index 162f70326..f78d74ef7 100644 --- a/libpod/container_inspect.go +++ b/libpod/container_inspect.go @@ -270,7 +270,7 @@ func parseMountOptionsForInspect(options []string, mount *define.InspectMount) { isRW = false case "rw": // Do nothing, silently discard - case "shared", "slave", "private", "rshared", "rslave", "rprivate": + case "shared", "slave", "private", "rshared", "rslave", "rprivate", "unbindable", "runbindable": mountProp = opt case "z", "Z": zZ = opt diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go index bf74ca954..83d5c20cb 100644 --- a/libpod/container_internal_linux.go +++ b/libpod/container_internal_linux.go @@ -344,7 +344,7 @@ func (c *Container) generateSpec(ctx context.Context) (*spec.Spec, error) { Type: "bind", Source: srcPath, Destination: dstPath, - Options: []string{"bind", "private"}, + Options: []string{"bind", "rprivate"}, } if c.IsReadOnly() && dstPath != "/dev/shm" { newMount.Options = append(newMount.Options, "ro", "nosuid", "noexec", "nodev") |