diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2020-01-14 18:55:20 -0500 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2020-01-16 09:23:32 -0500 |
| commit | 45e9a6b12e74d50b8f6ab271c7800cb165f451e4 (patch) | |
| tree | 5083048ba4ccf238dadd5c434528ee65b49fae62 /cmd/podman/create.go | |
| parent | 61fbce710b8d69e1203ea9055479a3f9dbe626b9 (diff) | |
| download | podman-45e9a6b12e74d50b8f6ab271c7800cb165f451e4.tar.gz podman-45e9a6b12e74d50b8f6ab271c7800cb165f451e4.tar.bz2 podman-45e9a6b12e74d50b8f6ab271c7800cb165f451e4.zip | |
Remove c.String(net)
We have a lot of cludgy code trying to make --net and --network equivalent.
This will allow --net to still exists but will eliminate the help and confusion.
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'cmd/podman/create.go')
| -rw-r--r-- | cmd/podman/create.go | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/cmd/podman/create.go b/cmd/podman/create.go index 73fba5a8c..01cad9765 100644 --- a/cmd/podman/create.go +++ b/cmd/podman/create.go @@ -85,13 +85,7 @@ func createInit(c *cliconfig.PodmanCommand) error { logrus.Warn("setting security options with --privileged has no effect") } - var setNet string - if c.IsSet("network") { - setNet = c.String("network") - } else if c.IsSet("net") { - setNet = c.String("net") - } - if (c.IsSet("dns") || c.IsSet("dns-opt") || c.IsSet("dns-search")) && (setNet == "none" || strings.HasPrefix(setNet, "container:")) { + if (c.IsSet("dns") || c.IsSet("dns-opt") || c.IsSet("dns-search")) && (c.String("network") == "none" || strings.HasPrefix(c.String("network"), "container:")) { return errors.Errorf("conflicting options: dns and the network mode.") } |