From 3762946e63866744be01e49702d3cdac59f74e38 Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Wed, 9 Feb 2022 15:51:57 +0100 Subject: [PATCH] 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 --- cmd/podman/registry/config.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/cmd/podman/registry/config.go b/cmd/podman/registry/config.go index 15bb7aee0a..b5c9b359c3 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} }