summaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@pm.me>2020-06-22 16:08:09 -0400
committerMatthew Heon <matthew.heon@pm.me>2020-06-22 16:08:09 -0400
commit13cfdb0742ebf7fbf2d90e82e527a5386d030ab8 (patch)
tree38c9a13282752014ebd9386c82c0dbc7e1b15b17 /cmd
parent22942e392df57d0ae5cc8ebdd27d060e43206d62 (diff)
downloadpodman-13cfdb0742ebf7fbf2d90e82e527a5386d030ab8.tar.gz
podman-13cfdb0742ebf7fbf2d90e82e527a5386d030ab8.tar.bz2
podman-13cfdb0742ebf7fbf2d90e82e527a5386d030ab8.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.go4
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()
}