diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-10-04 15:01:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-04 15:01:38 -0400 |
| commit | 2f72f17a114f4e20b56deb2c21908d1d4610919c (patch) | |
| tree | 27d03a819da8a21414a7a312b5d9d3b8c319ba42 /libpod/runtime.go | |
| parent | 800e91dafd47c284489be586bd18c3cdf7dc5737 (diff) | |
| parent | a726043d0b5c4ff9e59b01f2a48c575d53d67ed0 (diff) | |
| download | podman-2f72f17a114f4e20b56deb2c21908d1d4610919c.tar.gz podman-2f72f17a114f4e20b56deb2c21908d1d4610919c.tar.bz2 podman-2f72f17a114f4e20b56deb2c21908d1d4610919c.zip | |
Merge pull request #11846 from Luap99/network-reload
CNI networks: reload networks if needed
Diffstat (limited to 'libpod/runtime.go')
| -rw-r--r-- | libpod/runtime.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libpod/runtime.go b/libpod/runtime.go index 27885bf5c..855f3a9f9 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -489,8 +489,7 @@ func makeRuntime(ctx context.Context, runtime *Runtime) (retErr error) { DefaultNetwork: runtime.config.Network.DefaultNetwork, DefaultSubnet: runtime.config.Network.DefaultSubnet, IsMachine: runtime.config.Engine.MachineEnabled, - // TODO use cni.lock - LockFile: filepath.Join(runtime.config.Network.NetworkConfigDir, "cni1.lock"), + LockFile: filepath.Join(runtime.config.Network.NetworkConfigDir, "cni.lock"), }) if err != nil { return errors.Wrapf(err, "could not create network interface") |