diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-02-09 14:51:53 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-09 14:51:53 -0500 |
| commit | 12836a5610ea6d4f6844d4fbdc222b439ccbc746 (patch) | |
| tree | 023732a522dd9710968a005bc37095eb7ff1dbd5 | |
| parent | cd9ec7f7c3da666b234e2f53ef52c0a4089373fd (diff) | |
| parent | 3762946e63866744be01e49702d3cdac59f74e38 (diff) | |
| download | podman-12836a5610ea6d4f6844d4fbdc222b439ccbc746.tar.gz podman-12836a5610ea6d4f6844d4fbdc222b439ccbc746.tar.bz2 podman-12836a5610ea6d4f6844d4fbdc222b439ccbc746.zip | |
Merge pull request #13184 from Luap99/cni-dir
Do not set the network config dir to cni plugin dir
| -rw-r--r-- | cmd/podman/registry/config.go | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/cmd/podman/registry/config.go b/cmd/podman/registry/config.go index 15bb7aee0..b5c9b359c 100644 --- a/cmd/podman/registry/config.go +++ b/cmd/podman/registry/config.go @@ -81,11 +81,6 @@ func newPodmanConfig() { mode = entities.TunnelMode } - cfg.Network.NetworkConfigDir = cfg.Network.CNIPluginDirs[0] - if rootless.IsRootless() { - cfg.Network.NetworkConfigDir = "" - } - podmanOptions = entities.PodmanConfig{Config: cfg, EngineMode: mode} } |