diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-11-20 22:07:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-20 22:07:32 +0100 |
| commit | b4b4fa07a97560085bfedbf0498a9301eb815435 (patch) | |
| tree | 18b0d26b34d8d4455ede7b487fce46be78da1910 /libpod/rootless_cni_linux.go | |
| parent | 41c88a66080c88d9855c422aed4bf30464e94126 (diff) | |
| parent | ce775248ada62c117dd5303989052b268e6594bd (diff) | |
| download | podman-b4b4fa07a97560085bfedbf0498a9301eb815435.tar.gz podman-b4b4fa07a97560085bfedbf0498a9301eb815435.tar.bz2 podman-b4b4fa07a97560085bfedbf0498a9301eb815435.zip | |
Merge pull request #8431 from mheon/networks_returns_default
Make c.networks() list include the default network
Diffstat (limited to 'libpod/rootless_cni_linux.go')
| -rw-r--r-- | libpod/rootless_cni_linux.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libpod/rootless_cni_linux.go b/libpod/rootless_cni_linux.go index 1d6158cc2..2c2977f9f 100644 --- a/libpod/rootless_cni_linux.go +++ b/libpod/rootless_cni_linux.go @@ -40,7 +40,7 @@ const ( // // AllocRootlessCNI does not lock c. c should be already locked. func AllocRootlessCNI(ctx context.Context, c *Container) (ns.NetNS, []*cnitypes.Result, error) { - networks, err := c.networks() + networks, _, err := c.networks() if err != nil { return nil, nil, err } @@ -81,7 +81,7 @@ func AllocRootlessCNI(ctx context.Context, c *Container) (ns.NetNS, []*cnitypes. // // DeallocRootlessCNI does not lock c. c should be already locked. func DeallocRootlessCNI(ctx context.Context, c *Container) error { - networks, err := c.networks() + networks, _, err := c.networks() if err != nil { return err } |