From 13cfdb0742ebf7fbf2d90e82e527a5386d030ab8 Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Mon, 22 Jun 2020 16:08:09 -0400 Subject: 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 --- cmd/podman/containers/create.go | 4 ---- 1 file changed, 4 deletions(-) (limited to 'cmd') 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() } -- cgit v1.2.3-54-g00ecf