opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-15 03:02:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

rename --cni-config-dir to --network-config-dir

Browse Source 
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>
This commit is contained in:
Paul Holzinger
2022-01-18 16:17:53 +01:00
parent 55ad6188b0
commit c0e0723463
14 changed files with 57 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
docs/source/markdown/podman.1.md
View File

@ -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`)