diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-07-21 13:43:54 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-21 13:43:54 -0400 |
| commit | 0291928abb27aceda429088eede903604a1e9bbd (patch) | |
| tree | 4f6efed902d338c8b8eb7fdb79247b29e2551e9a /docs/tutorials | |
| parent | 1b8d0e454353224a571bcec7d37240140ec7917f (diff) | |
| parent | 330e9144bd49a090484ade39339b3c3453253105 (diff) | |
| download | podman-0291928abb27aceda429088eede903604a1e9bbd.tar.gz podman-0291928abb27aceda429088eede903604a1e9bbd.tar.bz2 podman-0291928abb27aceda429088eede903604a1e9bbd.zip | |
Merge pull request #7033 from rhatdan/v2.0
[2.0] Switch references from libpod.conf to containers.conf
Diffstat (limited to 'docs/tutorials')
| -rw-r--r-- | docs/tutorials/rootless_tutorial.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/tutorials/rootless_tutorial.md b/docs/tutorials/rootless_tutorial.md index 440e12062..821c07647 100644 --- a/docs/tutorials/rootless_tutorial.md +++ b/docs/tutorials/rootless_tutorial.md @@ -13,7 +13,7 @@ The alternative OCI runtime support for cgroup V2 can be turned on at the comma ``` sudo podman --runtime /usr/bin/crun ``` -or by changing the value for the "Default OCI runtime" in the libpod.conf file either at the system level or at the [user level](#user-configuration-files) from `runtime = "runc"` to `runtime = "crun"`. +or by changing the value for the "Default OCI runtime" in the containers.conf file either at the system level or at the [user level](#user-configuration-files) from `runtime = "runc"` to `runtime = "crun"`. ## Administrator Actions @@ -106,7 +106,7 @@ Once the Administrator has completed the setup on the machine and then the confi ### User Configuration Files -The Podman configuration files for root reside in `/usr/share/containers` with overrides in `/etc/containers`. In the rootless environment they reside in `${XDG_CONFIG_HOME}/containers` (usually `~/.config/containers`) and are owned by each individual user. The main files are `libpod.conf` and `storage.conf` and the user can modify these files as they wish. +The Podman configuration files for root reside in `/usr/share/containers` with overrides in `/etc/containers`. In the rootless environment they reside in `${XDG_CONFIG_HOME}/containers` (usually `~/.config/containers`) and are owned by each individual user. The main files are `containers.conf` and `storage.conf` and the user can modify these files as they wish. The default authorization file used by the `podman login` and `podman logout` commands reside in `${XDG_RUNTIME_DIR}/containers/auth.json`. |