diff options
author | Matthew Heon <matthew.heon@pm.me> | 2020-06-22 16:08:09 -0400 |
---|---|---|
committer | Matthew Heon <mheon@redhat.com> | 2020-06-24 14:37:35 -0400 |
commit | 0b4dcc7a36045f88c7bb6fde3884dd52f898e13f (patch) | |
tree | b210fa0638a9882ef373b664e9db9505b873d400 /cmd | |
parent | 7ea37dfe19f83982e886bce9ee8e23ab71e58286 (diff) | |
download | podman-0b4dcc7a36045f88c7bb6fde3884dd52f898e13f.tar.gz podman-0b4dcc7a36045f88c7bb6fde3884dd52f898e13f.tar.bz2 podman-0b4dcc7a36045f88c7bb6fde3884dd52f898e13f.zip |
Fix conflicts between privileged and other flags
The `--privileged` flag does not conflict with `--group-add`
(this one was breaking Toolbox) and does not conflict with most
parts of `--security-opt` (this was breaking Openstack).
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
Diffstat (limited to 'cmd')
-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() } |