diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-01-16 17:07:56 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-16 17:07:56 +0100 |
| commit | 1d7176b135fab2da4800b11f91b912963aa0288b (patch) | |
| tree | f7cbc5cfe8423fe6998fd51783d0db159533cbbc /cmd/podman/shared/intermediate_varlink.go | |
| parent | db00ee97e950290a6bc5d669cde0cbc54bb94afe (diff) | |
| parent | 45e9a6b12e74d50b8f6ab271c7800cb165f451e4 (diff) | |
| download | podman-1d7176b135fab2da4800b11f91b912963aa0288b.tar.gz podman-1d7176b135fab2da4800b11f91b912963aa0288b.tar.bz2 podman-1d7176b135fab2da4800b11f91b912963aa0288b.zip | |
Merge pull request #4869 from rhatdan/network
Remove c.String(net)
Diffstat (limited to 'cmd/podman/shared/intermediate_varlink.go')
| -rw-r--r-- | cmd/podman/shared/intermediate_varlink.go | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/cmd/podman/shared/intermediate_varlink.go b/cmd/podman/shared/intermediate_varlink.go index 89bd52324..691c4f92d 100644 --- a/cmd/podman/shared/intermediate_varlink.go +++ b/cmd/podman/shared/intermediate_varlink.go @@ -127,7 +127,6 @@ func (g GenericCLIResults) MakeVarlink() iopodman.Create { MemorySwap: StringToPtr(g.Find("memory-swap")), MemorySwappiness: AnyIntToInt64Ptr(g.Find("memory-swappiness")), Name: StringToPtr(g.Find("name")), - Net: StringToPtr(g.Find("net")), Network: StringToPtr(g.Find("network")), OomKillDisable: BoolToPtr(g.Find("oom-kill-disable")), OomScoreAdj: AnyIntToInt64Ptr(g.Find("oom-score-adj")), @@ -386,7 +385,6 @@ func VarlinkCreateToGeneric(opts iopodman.Create) GenericCLIResults { m["memory-swap"] = stringFromVarlink(opts.MemorySwap, "memory-swap", nil) m["memory-swappiness"] = int64FromVarlink(opts.MemorySwappiness, "memory-swappiness", &memSwapDefault) m["name"] = stringFromVarlink(opts.Name, "name", nil) - m["net"] = stringFromVarlink(opts.Net, "net", &netModeDefault) m["network"] = stringFromVarlink(opts.Network, "network", &netModeDefault) m["no-hosts"] = boolFromVarlink(opts.NoHosts, "no-hosts", false) m["oom-kill-disable"] = boolFromVarlink(opts.OomKillDisable, "oon-kill-disable", false) |