diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-01-18 15:42:06 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-18 15:42:06 -0500 |
| commit | 094b11cbcb528a7d120c31402a1bcd9c82d84938 (patch) | |
| tree | 3ce00f13dda775d979a093658f26cea4122646d9 /pkg/domain | |
| parent | 62212dbf490d736ad06523a92345a480e4972dab (diff) | |
| parent | c0e07234631cfcea1d6724c05606964a4d833f39 (diff) | |
| download | podman-094b11cbcb528a7d120c31402a1bcd9c82d84938.tar.gz podman-094b11cbcb528a7d120c31402a1bcd9c82d84938.tar.bz2 podman-094b11cbcb528a7d120c31402a1bcd9c82d84938.zip | |
Merge pull request #12908 from Luap99/network-conf-dir
rename --cni-config-dir to --network-config-dir
Diffstat (limited to 'pkg/domain')
| -rw-r--r-- | pkg/domain/infra/runtime_libpod.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkg/domain/infra/runtime_libpod.go b/pkg/domain/infra/runtime_libpod.go index 519af5ab7..f9ceb9305 100644 --- a/pkg/domain/infra/runtime_libpod.go +++ b/pkg/domain/infra/runtime_libpod.go @@ -223,7 +223,7 @@ func getRuntime(ctx context.Context, fs *flag.FlagSet, opts *engineOpts) (*libpo // TODO flag to set libpod static dir? // TODO flag to set libpod tmp dir? - if fs.Changed("cni-config-dir") { + if fs.Changed("network-config-dir") { options = append(options, libpod.WithCNIConfigDir(cfg.Network.NetworkConfigDir)) } if fs.Changed("default-mounts-file") { |