From 8f7ed50cb20c04bbbb7c4907a183c07912d4bffb Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Thu, 9 Jul 2020 14:53:46 -0400 Subject: Cleanup handling of podman mount/unmount We should default to the user name unmount rather then the internal name of umount. Also User namespace was not being handled correctly. We want to inform the user that if they do a mount when in rootless mode that they have to be first in the podman unshare state. Signed-off-by: Daniel J Walsh --- .../markdown/links/podman-container-umount.1 | 2 +- .../markdown/links/podman-container-unmount.1 | 2 +- docs/source/markdown/links/podman-umount.1 | 1 + docs/source/markdown/links/podman-unmount.1 | 1 - docs/source/markdown/podman-container.1.md | 2 +- docs/source/markdown/podman-mount.1.md | 9 ++-- docs/source/markdown/podman-umount.1.md | 55 ---------------------- docs/source/markdown/podman-unmount.1.md | 55 ++++++++++++++++++++++ docs/source/markdown/podman.1.md | 2 +- 9 files changed, 66 insertions(+), 63 deletions(-) create mode 100644 docs/source/markdown/links/podman-umount.1 delete mode 100644 docs/source/markdown/links/podman-unmount.1 delete mode 100644 docs/source/markdown/podman-umount.1.md create mode 100644 docs/source/markdown/podman-unmount.1.md (limited to 'docs') diff --git a/docs/source/markdown/links/podman-container-umount.1 b/docs/source/markdown/links/podman-container-umount.1 index 789dabbb0..aa4add453 100644 --- a/docs/source/markdown/links/podman-container-umount.1 +++ b/docs/source/markdown/links/podman-container-umount.1 @@ -1 +1 @@ -.so man1/podman-umount.1 +.so man1/podman-unmount.1 diff --git a/docs/source/markdown/links/podman-container-unmount.1 b/docs/source/markdown/links/podman-container-unmount.1 index 789dabbb0..aa4add453 100644 --- a/docs/source/markdown/links/podman-container-unmount.1 +++ b/docs/source/markdown/links/podman-container-unmount.1 @@ -1 +1 @@ -.so man1/podman-umount.1 +.so man1/podman-unmount.1 diff --git a/docs/source/markdown/links/podman-umount.1 b/docs/source/markdown/links/podman-umount.1 new file mode 100644 index 000000000..aa4add453 --- /dev/null +++ b/docs/source/markdown/links/podman-umount.1 @@ -0,0 +1 @@ +.so man1/podman-unmount.1 diff --git a/docs/source/markdown/links/podman-unmount.1 b/docs/source/markdown/links/podman-unmount.1 deleted file mode 100644 index 789dabbb0..000000000 --- a/docs/source/markdown/links/podman-unmount.1 +++ /dev/null @@ -1 +0,0 @@ -.so man1/podman-umount.1 diff --git a/docs/source/markdown/podman-container.1.md b/docs/source/markdown/podman-container.1.md index 4ea7c7acc..0a6ceea33 100644 --- a/docs/source/markdown/podman-container.1.md +++ b/docs/source/markdown/podman-container.1.md @@ -41,7 +41,7 @@ The container command allows you to manage containers | stats | [podman-stats(1)](podman-stats.1.md) | Display a live stream of one or more container's resource usage statistics. | | stop | [podman-stop(1)](podman-stop.1.md) | Stop one or more running containers. | | top | [podman-top(1)](podman-top.1.md) | Display the running processes of a container. | -| umount | [podman-umount(1)](podman-umount.1.md) | Unmount a working container's root filesystem.(Alias unmount) | +| unmount | [podman-unmount(1)](podman-unmount.1.md) | Unmount a working container's root filesystem.(Alias unmount) | | unpause | [podman-unpause(1)](podman-unpause.1.md) | Unpause one or more containers. | | wait | [podman-wait(1)](podman-wait.1.md) | Wait on one or more containers to stop and print their exit codes. | diff --git a/docs/source/markdown/podman-mount.1.md b/docs/source/markdown/podman-mount.1.md index eaed1051e..33c5aece8 100644 --- a/docs/source/markdown/podman-mount.1.md +++ b/docs/source/markdown/podman-mount.1.md @@ -12,9 +12,12 @@ podman\-mount - Mount a working container's root filesystem Mounts the specified containers' root file system in a location which can be accessed from the host, and returns its location. -If you execute the command without any arguments, the tool will list all of the +If you execute the command without any arguments, Podman will list all of the currently mounted containers. +Rootless mode only supports mounting VFS driver, unless you enter the user namespace +via the `podman unshare` command. All other storage drivers will fail to mount. + ## RETURN VALUE The location of the mounted file system. On error an empty string and errno is returned. @@ -27,7 +30,7 @@ Mount all containers. **--format**=*format* -Print the mounted containers in specified format (json) +Print the mounted containers in specified format (json). **--latest**, **-l** @@ -70,4 +73,4 @@ a7060253093b /var/lib/containers/storage/overlay/0ff7d7ca68bed1ace424f9df154d2dd ``` ## SEE ALSO -podman(1), podman-umount(1), mount(8) +podman(1), podman-umount(1), mount(8), podman-unshare(1) diff --git a/docs/source/markdown/podman-umount.1.md b/docs/source/markdown/podman-umount.1.md deleted file mode 100644 index 31a213f28..000000000 --- a/docs/source/markdown/podman-umount.1.md +++ /dev/null @@ -1,55 +0,0 @@ -% podman-umount(1) - -## NAME -podman\-umount - Unmount a working container's root filesystem - -## SYNOPSIS -**podman umount** [*options*] *container* [...] - -**podman container umount** [*options*] *container* [...] - -**podman container unmount** [*options*] *container* [...] - -**podman unmount** [*options*] *container* [...] - -## DESCRIPTION -Unmounts the specified containers' root file system, if no other processes -are using it. - -Container storage increments a mount counter each time a container is mounted. -When a container is unmounted, the mount counter is decremented and the -container's root filesystem is physically unmounted only when the mount -counter reaches zero indicating no other processes are using the mount. -An unmount can be forced with the --force flag. - -## OPTIONS -**--all**, **-a** - -All of the currently mounted containers will be unmounted. - -**--force**, **-f** - -Force the unmounting of specified containers' root file system, even if other -processes have mounted it. - -Note: This could cause other processes that are using the file system to fail, -as the mount point could be removed without their knowledge. - -**--latest**, **-l** - -Instead of providing the container name or ID, use the last created container. -If you use methods other than Podman to run containers such as CRI-O, the last -started container could be from either of those methods. - -The latest option is not supported on the remote client. - -## EXAMPLE - -podman umount containerID - -podman umount containerID1 containerID2 containerID3 - -podman umount --all - -## SEE ALSO -podman(1), podman-mount(1) diff --git a/docs/source/markdown/podman-unmount.1.md b/docs/source/markdown/podman-unmount.1.md new file mode 100644 index 000000000..47c55cc0b --- /dev/null +++ b/docs/source/markdown/podman-unmount.1.md @@ -0,0 +1,55 @@ +% podman-unmount(1) + +## NAME +podman\-unmount - Unmount a working container's root filesystem + +## SYNOPSIS +**podman unmount** [*options*] *container* [...] + +**podman umount** [*options*] *container* [...] + +**podman container unmount** [*options*] *container* [...] + +**podman container umount** [*options*] *container* [...] + +## DESCRIPTION +Unmounts the specified containers' root file system, if no other processes +are using it. + +Container storage increments a mount counter each time a container is mounted. +When a container is unmounted, the mount counter is decremented, and the +container's root filesystem is physically unmounted only when the mount +counter reaches zero indicating no other processes are using the mount. +An unmount can be forced with the --force flag. + +## OPTIONS +**--all**, **-a** + +All of the currently mounted containers will be unmounted. + +**--force**, **-f** + +Force the unmounting of specified containers' root file system, even if other +processes have mounted it. + +Note: This could cause other processes that are using the file system to fail, +as the mount point could be removed without their knowledge. + +**--latest**, **-l** + +Instead of providing the container name or ID, use the last created container. +If you use methods other than Podman to run containers such as CRI-O, the last +started container could be from either of those methods. + +The latest option is not supported on the remote client. + +## EXAMPLE + +podman container unmount containerID + +podman unmount containerID1 containerID2 containerID3 + +podman unmount --all + +## SEE ALSO +podman(1), podman-container-mount(1), podman-image-mount(1) diff --git a/docs/source/markdown/podman.1.md b/docs/source/markdown/podman.1.md index 776ee7a67..e0d66b6d4 100644 --- a/docs/source/markdown/podman.1.md +++ b/docs/source/markdown/podman.1.md @@ -207,7 +207,7 @@ the exit codes follow the `chroot` standard, see below: | [podman-system(1)](podman-system.1.md) | Manage podman. | | [podman-tag(1)](podman-tag.1.md) | Add an additional name to a local image. | | [podman-top(1)](podman-top.1.md) | Display the running processes of a container. | -| [podman-umount(1)](podman-umount.1.md) | Unmount a working container's root filesystem. | +| [podman-unmount(1)](podman-unmount.1.md) | Unmount a working container's root filesystem. | | [podman-unpause(1)](podman-unpause.1.md) | Unpause one or more containers. | | [podman-unshare(1)](podman-unshare.1.md) | Run a command inside of a modified user namespace. | | [podman-untag(1)](podman-untag.1.md) | Removes one or more names from a locally-stored image. | -- cgit v1.2.3-54-g00ecf