mirror of
https://github.com/containers/podman
synced 2024-10-20 17:23:30 +00:00
Do not set the network config dir to cni plugin dir
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:
parent
eb0a0db318
commit
3762946e63
|
@ -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}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue