diff options
author | Paul Holzinger <pholzing@redhat.com> | 2022-01-18 16:17:53 +0100 |
---|---|---|
committer | Paul Holzinger <pholzing@redhat.com> | 2022-01-18 19:28:25 +0100 |
commit | c0e07234631cfcea1d6724c05606964a4d833f39 (patch) | |
tree | 57c80b1ff2804f26a0546117b01c30ffbadcbc1c /docs/source/markdown | |
parent | 55ad6188b067ba6594819c318dd2ae92dea2f27e (diff) | |
download | podman-c0e07234631cfcea1d6724c05606964a4d833f39.tar.gz podman-c0e07234631cfcea1d6724c05606964a4d833f39.tar.bz2 podman-c0e07234631cfcea1d6724c05606964a4d833f39.zip |
rename --cni-config-dir to --network-config-dir
Since this option will also be used for netavark we should rename it to
something more generic. It is important that --cni-config-dir still
works otherwise we could break existing container cleanup commands.
Signed-off-by: Paul Holzinger <pholzing@redhat.com>
Diffstat (limited to 'docs/source/markdown')
-rw-r--r-- | docs/source/markdown/podman.1.md | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/docs/source/markdown/podman.1.md b/docs/source/markdown/podman.1.md index c1a22c0c1..bb8f889f5 100644 --- a/docs/source/markdown/podman.1.md +++ b/docs/source/markdown/podman.1.md @@ -32,8 +32,13 @@ The CGroup manager to use for container cgroups. Supported values are cgroupfs o Note: Setting this flag can cause certain commands to break when called on containers previously created by the other CGroup manager type. Note: CGroup manager is not supported in rootless mode when using CGroups Version V1. -#### **--cni-config-dir** -Path of the configuration directory for CNI networks. (Default: `/etc/cni/net.d`) +#### **--network-config-dir**=*directory* + +Path to the directory where network configuration files are located. +For the CNI backend the default is "/etc/cni/net.d" as root +and "$HOME/.config/cni/net.d" as rootless. +For the netavark backend "/etc/containers/networks" is used as root +and "$graphroot/networks" as rootless. #### **--connection**, **-c** Connection to use for remote podman (Default connection is configured in `containers.conf`) |