opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-28 14:29:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Do not set the network config dir to cni plugin dir

Browse Source 
I do not know why this code was added but it is wrong. We should never
use a plugin dir as config dir. Also this will fail for netavark. The
correct default will be set in c/common so podman should not touch it.

[NO NEW TESTS NEEDED]

Ref #13183

Signed-off-by: Paul Holzinger <pholzing@redhat.com>
This commit is contained in:
Paul Holzinger
2022-02-09 15:51:57 +01:00
parent eb0a0db318
commit 3762946e63
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/podman/registry/config.go
View File

@ -81,11 +81,6 @@ func newPodmanConfig() {
mode = entities.TunnelMode mode = entities.TunnelMode
} }
cfg.Network.NetworkConfigDir = cfg.Network.CNIPluginDirs[0]
if rootless.IsRootless() {
cfg.Network.NetworkConfigDir = ""
}
podmanOptions = entities.PodmanConfig{Config: cfg, EngineMode: mode} podmanOptions = entities.PodmanConfig{Config: cfg, EngineMode: mode}
} }