erabo/spiegel_podman
1
0
Fork 0
mirror of https://github.com/podman-container-tools/podman.git synced 2026-08-12 03:45:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

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 • committed by Matthew Heon
parent d0fccbbbba
commit f8cd4df1b6
1 changed files with 0 additions and 5 deletions
Show stats 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
}
cfg.Network.NetworkConfigDir = cfg.Network.CNIPluginDirs[0]
if rootless.IsRootless() {
cfg.Network.NetworkConfigDir = ""
}
podmanOptions = entities.PodmanConfig{Config: cfg, EngineMode: mode}
}