diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-06-23 00:18:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-23 00:18:52 +0200 |
| commit | 22a7d60f18a60bda02b40b5f2489014ba5f1c651 (patch) | |
| tree | 38c9a13282752014ebd9386c82c0dbc7e1b15b17 /cmd/podman | |
| parent | 22942e392df57d0ae5cc8ebdd27d060e43206d62 (diff) | |
| parent | 13cfdb0742ebf7fbf2d90e82e527a5386d030ab8 (diff) | |
| download | podman-22a7d60f18a60bda02b40b5f2489014ba5f1c651.tar.gz podman-22a7d60f18a60bda02b40b5f2489014ba5f1c651.tar.bz2 podman-22a7d60f18a60bda02b40b5f2489014ba5f1c651.zip | |
Merge pull request #6715 from mheon/fix_security_exclusive
Fix conflicts between privileged and other flags
Diffstat (limited to 'cmd/podman')
| -rw-r--r-- | cmd/podman/containers/create.go | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/cmd/podman/containers/create.go b/cmd/podman/containers/create.go index 6269ec781..45ce00c86 100644 --- a/cmd/podman/containers/create.go +++ b/cmd/podman/containers/create.go @@ -156,10 +156,6 @@ func replaceContainer(name string) error { } func createInit(c *cobra.Command) error { - if c.Flag("privileged").Changed && c.Flag("security-opt").Changed { - logrus.Warn("setting security options with --privileged has no effect") - } - if c.Flag("shm-size").Changed { cliVals.ShmSize = c.Flag("shm-size").Value.String() } |