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 /pkg | |
| 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 'pkg')
| -rw-r--r-- | pkg/spec/storage.go | 2 | ||||
| -rw-r--r-- | pkg/util/mountOpts.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkg/spec/storage.go b/pkg/spec/storage.go index ebf5ec196..b441daf08 100644 --- a/pkg/spec/storage.go +++ b/pkg/spec/storage.go @@ -445,7 +445,7 @@ func getBindMount(args []string) (spec.Mount, error) { } setExec = true newMount.Options = append(newMount.Options, kv[0]) - case "shared", "rshared", "private", "rprivate", "slave", "rslave", "Z", "z": + case "shared", "rshared", "private", "rprivate", "slave", "rslave", "unbindable", "runbindable", "Z", "z": newMount.Options = append(newMount.Options, kv[0]) case "bind-propagation": if len(kv) == 1 { diff --git a/pkg/util/mountOpts.go b/pkg/util/mountOpts.go index eab2657e3..580aaf4f2 100644 --- a/pkg/util/mountOpts.go +++ b/pkg/util/mountOpts.go @@ -57,7 +57,7 @@ func ProcessOptions(options []string, isTmpfs bool, sourcePath string) ([]string return nil, errors.Wrapf(ErrDupeMntOption, "only one of 'rw' and 'ro' can be used") } foundWrite = true - case "private", "rprivate", "slave", "rslave", "shared", "rshared": + case "private", "rprivate", "slave", "rslave", "shared", "rshared", "unbindable", "runbindable": if foundProp { return nil, errors.Wrapf(ErrDupeMntOption, "only one root propagation mode can be used") } |