diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2021-06-22 16:17:12 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-22 16:17:12 -0400 |
| commit | d3afc6b3b6d6ba1d900b74d24affb132f38622d3 (patch) | |
| tree | f5221692ff443286c4cfb729c14571a088663b1e /libpod/runtime.go | |
| parent | 1b27234d13d651e91b79f91397f7b4885f716872 (diff) | |
| parent | e014608539c251e917ff675b12b22c6f92f0deac (diff) | |
| download | podman-d3afc6b3b6d6ba1d900b74d24affb132f38622d3.tar.gz podman-d3afc6b3b6d6ba1d900b74d24affb132f38622d3.tar.bz2 podman-d3afc6b3b6d6ba1d900b74d24affb132f38622d3.zip | |
Merge pull request #10741 from Luap99/test-ocicni
Do not use inotify for OCICNI
Diffstat (limited to 'libpod/runtime.go')
| -rw-r--r-- | libpod/runtime.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libpod/runtime.go b/libpod/runtime.go index 84649bf3e..f53789e89 100644 --- a/libpod/runtime.go +++ b/libpod/runtime.go @@ -468,7 +468,7 @@ func makeRuntime(ctx context.Context, runtime *Runtime) (retErr error) { } // Set up the CNI net plugin - netPlugin, err := ocicni.InitCNI(runtime.config.Network.DefaultNetwork, runtime.config.Network.NetworkConfigDir, runtime.config.Network.CNIPluginDirs...) + netPlugin, err := ocicni.InitCNINoInotify(runtime.config.Network.DefaultNetwork, runtime.config.Network.NetworkConfigDir, "", runtime.config.Network.CNIPluginDirs...) if err != nil { return errors.Wrapf(err, "error configuring CNI network plugin") } |