diff options
| author | Paul Holzinger <pholzing@redhat.com> | 2022-02-09 15:51:57 +0100 |
|---|---|---|
| committer | Matthew Heon <matthew.heon@pm.me> | 2022-02-10 14:04:17 -0500 |
| commit | f8cd4df1b6024baf0841f0d554ffcc4d975fe12d (patch) | |
| tree | e64b8be8ec32c76c0e07f2ee908b4ac9b5e5b50e | |
| parent | d0fccbbbbad9b47a39827865f96a1b03e12ac303 (diff) | |
| download | podman-f8cd4df1b6024baf0841f0d554ffcc4d975fe12d.tar.gz podman-f8cd4df1b6024baf0841f0d554ffcc4d975fe12d.tar.bz2 podman-f8cd4df1b6024baf0841f0d554ffcc4d975fe12d.zip | |
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>
| -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} } |