summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-11-03 14:34:08 -0500
committerGitHub <noreply@github.com>2020-11-03 14:34:08 -0500
commit5b17f58e7e8deb7a82e2b9e2e9929e1439f3f009 (patch)
tree2a9f168c80a161933f0658eff5e491e8e79902e3
parent1e83aea9e67740d001e1ea3920038c9de2375175 (diff)
parent448aafc2fd985bbcc242de691d8d107349a5ea4c (diff)
downloadpodman-5b17f58e7e8deb7a82e2b9e2e9929e1439f3f009.tar.gz
podman-5b17f58e7e8deb7a82e2b9e2e9929e1439f3f009.tar.bz2
podman-5b17f58e7e8deb7a82e2b9e2e9929e1439f3f009.zip
Merge pull request #8219 from rhafer/rootless-mounts
docs: Mention mounts.conf location for non-root users
-rw-r--r--docs/source/markdown/containers-mounts.conf.5.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/source/markdown/containers-mounts.conf.5.md b/docs/source/markdown/containers-mounts.conf.5.md
index 130c1c523..74492c831 100644
--- a/docs/source/markdown/containers-mounts.conf.5.md
+++ b/docs/source/markdown/containers-mounts.conf.5.md
@@ -10,7 +10,7 @@ The mounts.conf file specifies volume mount directories that are automatically m
The format of the mounts.conf is the volume format `/SRC:/DEST`, one mount per line. For example, a mounts.conf with the line `/usr/share/secrets:/run/secrets` would cause the contents of the `/usr/share/secrets` directory on the host to be mounted on the `/run/secrets` directory inside the container. Setting mountpoints allows containers to use the files of the host, for instance, to use the host's subscription to some enterprise Linux distribution.
## FILES
-Some distributions may provide a `/usr/share/containers/mounts.conf` file to provide default mounts, but users can create a `/etc/containers/mounts.conf`, to specify their own special volumes to mount in the container.
+Some distributions may provide a `/usr/share/containers/mounts.conf` file to provide default mounts, but users can create a `/etc/containers/mounts.conf`, to specify their own special volumes to mount in the container. When Podman runs in rootless mode, the file `$HOME/.config/containers/mounts.conf` will override the default if it exists.
## HISTORY
Aug 2018, Originally compiled by Valentin Rothberg <vrothberg@suse.com>