Skip to content

Commit

Permalink
Do not set the network config dir to cni plugin dir
Browse files Browse the repository at this point in the history
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 containers#13183

Signed-off-by: Paul Holzinger <[email protected]>
  • Loading branch information
Luap99 authored and mheon committed Feb 10, 2022
1 parent d0fccbb commit f8cd4df
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions cmd/podman/registry/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -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}
}

Expand Down

0 comments on commit f8cd4df

Please sign in to comment.