Merge pull request containers#10768 from xabinapal/issue-10767

openshift-merge-robot · web-flow · commit 8c7ce94b8130 · 2021-06-25T03:25:43.000-04:00
[NO TESTS NEEDED] Swap private and shared mount relabel options
diff --git a/cmd/podman/common/volumes.go b/cmd/podman/common/volumes.go
@@ -337,9 +337,9 @@ func getBindMount(args []string) (spec.Mount, error) {
 			}
 			switch kv[1] {
 			case "private":
-				newMount.Options = append(newMount.Options, "z")
-			case "shared":
 				newMount.Options = append(newMount.Options, "Z")
+			case "shared":
+				newMount.Options = append(newMount.Options, "z")
 			default:
 				return newMount, errors.Wrapf(util.ErrBadMntOption, "%s mount option must be 'private' or 'shared'", kv[0])
 			}

Original file line number	Diff line number	Diff line change
`@@ -337,9 +337,9 @@ func getBindMount(args []string) (spec.Mount, error) {`
`337`	`337`	`}`
`338`	`338`	`switch kv[1] {`
`339`	`339`	`case "private":`
`340`		`- newMount.Options = append(newMount.Options, "z")`
`341`		`- case "shared":`
`342`	`340`	`newMount.Options = append(newMount.Options, "Z")`
	`341`	`+ case "shared":`
	`342`	`+ newMount.Options = append(newMount.Options, "z")`
`343`	`343`	`default:`
`344`	`344`	`return newMount, errors.Wrapf(util.ErrBadMntOption, "%s mount option must be 'private' or 'shared'", kv[0])`
`345`	`345`	`}`