summaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-02-01 05:10:55 -0500
committerGitHub <noreply@github.com>2021-02-01 05:10:55 -0500
commit15e5a5c32b39fd8a62eb02fc4234c3a0d51e67f5 (patch)
tree1660c1b970b7ff1ded22f4471de166feadd56115 /pkg
parent4ead8067cd0fb0ee3dcf8245f81b97f8b25edc4d (diff)
parent4a6d042c282753b1c175468d23746de08b60cd53 (diff)
downloadpodman-15e5a5c32b39fd8a62eb02fc4234c3a0d51e67f5.tar.gz
podman-15e5a5c32b39fd8a62eb02fc4234c3a0d51e67f5.tar.bz2
podman-15e5a5c32b39fd8a62eb02fc4234c3a0d51e67f5.zip
Merge pull request #9151 from rhatdan/mount
Docker ignores mount flags that begin with constency
Diffstat (limited to 'pkg')
-rw-r--r--pkg/util/mountOpts.go4
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")