diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-02-05 17:24:34 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-05 17:24:34 -0500 |
| commit | 288fb688964cb7fc7086d0728daa1f5f6b726dd6 (patch) | |
| tree | e2246f42cb5241cc243fbec178324482c211d4a3 /pkg/util/mountOpts.go | |
| parent | 9e2cdc4a849091ba7eb1c5440b8970c819c46419 (diff) | |
| parent | c5c946b18fda59ffba826603b7784dc6e7cafda0 (diff) | |
| download | podman-288fb688964cb7fc7086d0728daa1f5f6b726dd6.tar.gz podman-288fb688964cb7fc7086d0728daa1f5f6b726dd6.tar.bz2 podman-288fb688964cb7fc7086d0728daa1f5f6b726dd6.zip | |
Merge pull request #9237 from mheon/backports_300_RC3
Backports for v3.0,0-RC3
Diffstat (limited to 'pkg/util/mountOpts.go')
| -rw-r--r-- | pkg/util/mountOpts.go | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkg/util/mountOpts.go b/pkg/util/mountOpts.go index 580aaf4f2..b3a38f286 100644 --- a/pkg/util/mountOpts.go +++ b/pkg/util/mountOpts.go @@ -86,6 +86,10 @@ func ProcessOptions(options []string, isTmpfs bool, sourcePath string) ([]string return nil, errors.Wrapf(ErrDupeMntOption, "the 'tmpcopyup' or 'notmpcopyup' option can only be set once") } foundCopyUp = true + case "consistency": + // Often used on MACs and mistakenly on Linux platforms. + // Since Docker ignores this option so shall we. + continue case "notmpcopyup": if !isTmpfs { return nil, errors.Wrapf(ErrBadMntOption, "the 'notmpcopyup' option is only allowed with tmpfs mounts") |