diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-11-18 22:01:15 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-18 22:01:15 +0100 |
| commit | 82a050a58f2ef2cf940c2ef49e1f8c4b17ab8beb (patch) | |
| tree | c05364eab1d8cee71183c57a83ff40888b072537 /pkg | |
| parent | 93510e8d26b5b2f116179161da4f35da315603da (diff) | |
| parent | e83d366651e9c68e2802924d7c7d3ac69ca3eb14 (diff) | |
| download | podman-82a050a58f2ef2cf940c2ef49e1f8c4b17ab8beb.tar.gz podman-82a050a58f2ef2cf940c2ef49e1f8c4b17ab8beb.tar.bz2 podman-82a050a58f2ef2cf940c2ef49e1f8c4b17ab8beb.zip | |
Merge pull request #12298 from giuseppe/idmapped-bind-mounts
volumes: add new option idmap
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/specgenutil/volumes.go | 2 | ||||
| -rw-r--r-- | pkg/util/mountOpts.go | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/pkg/specgenutil/volumes.go b/pkg/specgenutil/volumes.go index 184bfadf8..8ff770f9c 100644 --- a/pkg/specgenutil/volumes.go +++ b/pkg/specgenutil/volumes.go @@ -355,6 +355,8 @@ func getBindMount(args []string) (spec.Mount, error) { newMount.Options = append(newMount.Options, "U") } setOwnership = true + case "idmap": + newMount.Options = append(newMount.Options, "idmap") case "consistency": // Often used on MACs and mistakenly on Linux platforms. // Since Docker ignores this option so shall we. diff --git a/pkg/util/mountOpts.go b/pkg/util/mountOpts.go index f13dc94ec..959763dba 100644 --- a/pkg/util/mountOpts.go +++ b/pkg/util/mountOpts.go @@ -33,6 +33,7 @@ func ProcessOptions(options []string, isTmpfs bool, sourcePath string) ([]string // Some options have parameters - size, mode splitOpt := strings.SplitN(opt, "=", 2) switch splitOpt[0] { + case "idmap": case "O": if len(options) > 1 { return nil, errors.Wrapf(ErrDupeMntOption, "'O' option can not be used with other options") |