diff options
Diffstat (limited to 'docs/source')
-rw-r--r-- | docs/source/markdown/podman-build.1.md | 2 | ||||
-rw-r--r-- | docs/source/markdown/podman-container-clone.1.md | 4 | ||||
-rw-r--r-- | docs/source/markdown/podman-image-scp.1.md | 2 | ||||
-rw-r--r-- | docs/source/markdown/podman-image-unmount.1.md | 2 | ||||
-rw-r--r-- | docs/source/markdown/podman-machine-init.1.md | 6 | ||||
-rw-r--r-- | docs/source/markdown/podman-machine-set.1.md | 20 |
6 files changed, 20 insertions, 16 deletions
diff --git a/docs/source/markdown/podman-build.1.md b/docs/source/markdown/podman-build.1.md index 1080581d7..5793ecae5 100644 --- a/docs/source/markdown/podman-build.1.md +++ b/docs/source/markdown/podman-build.1.md @@ -429,7 +429,7 @@ container full access to local system services such as D-bus and is therefore considered insecure. - **ns:**_path_: path to a network namespace to join. - **private**: create a new namespace for the container (default) -- **\<network name|ID\>**: Join the network with the given name or ID, e.g. use `--network mynet` to join the network with the name mynet. Only supported for rootful users. +- **\<network name|ID\>**: Join the network with the given name or ID, e.g. use `--network mynet` to join the network with the name mynet. Only supported for rootfull users. #### **--no-cache** diff --git a/docs/source/markdown/podman-container-clone.1.md b/docs/source/markdown/podman-container-clone.1.md index 7d5e1c262..69423113d 100644 --- a/docs/source/markdown/podman-container-clone.1.md +++ b/docs/source/markdown/podman-container-clone.1.md @@ -125,6 +125,10 @@ If none are specified, the original container's CPU memory nodes are used. Remove the original container that we are cloning once used to mimic the configuration. +#### **--force**, **-f** + +Force removal of the original container that we are cloning. Can only be used in conjunction with **--destroy**. + #### **--memory**, **-m**=*limit* Memory limit (format: `<number>[<unit>]`, where unit = b (bytes), k (kilobytes), m (megabytes), or g (gigabytes)) diff --git a/docs/source/markdown/podman-image-scp.1.md b/docs/source/markdown/podman-image-scp.1.md index 1d902da91..6d5a51298 100644 --- a/docs/source/markdown/podman-image-scp.1.md +++ b/docs/source/markdown/podman-image-scp.1.md @@ -8,7 +8,7 @@ podman-image-scp - Securely copy an image from one host to another ## DESCRIPTION **podman image scp** copies container images between hosts on a network. You can load to the remote host or from the remote host as well as in between two remote hosts. -Note: `::` is used to specify the image name depending on if you are saving or loading. Images can also be transferred from rootful to rootless storage on the same machine without using sshd. This feature is not supported on the remote client, including Mac and Windows (excluding WSL2) machines. +Note: `::` is used to specify the image name depending on if you are saving or loading. Images can also be transferred from rootfull to rootless storage on the same machine without using sshd. This feature is not supported on the remote client, including Mac and Windows (excluding WSL2) machines. **podman image scp [GLOBAL OPTIONS]** diff --git a/docs/source/markdown/podman-image-unmount.1.md b/docs/source/markdown/podman-image-unmount.1.md index f2d75f15f..394811bd4 100644 --- a/docs/source/markdown/podman-image-unmount.1.md +++ b/docs/source/markdown/podman-image-unmount.1.md @@ -38,7 +38,7 @@ Unmount image with a given ID podman image unmount imageID ``` -Unmount multiple images wit given IDs +Unmount multiple images with given IDs ``` podman image unmount imageID1 imageID2 imageID3 ``` diff --git a/docs/source/markdown/podman-machine-init.1.md b/docs/source/markdown/podman-machine-init.1.md index 33947bbba..e42c5025b 100644 --- a/docs/source/markdown/podman-machine-init.1.md +++ b/docs/source/markdown/podman-machine-init.1.md @@ -59,9 +59,9 @@ Memory (in MB). Start the virtual machine immediately after it has been initialized. -#### **--rootful**=*true|false* +#### **--rootfull**=*true|false* -Whether this machine should prefer rootful (`true`) or rootless (`false`) +Whether this machine should prefer rootfull (`true`) or rootless (`false`) container execution. This option will also determine the remote connection default if there is no existing remote connection configurations. @@ -95,7 +95,7 @@ Driver to use for mounting volumes from the host, such as `virtfs`. ``` $ podman machine init $ podman machine init myvm -$ podman machine init --rootful +$ podman machine init --rootfull $ podman machine init --disk-size 50 $ podman machine init --memory=1024 myvm $ podman machine init -v /Users:/mnt/Users diff --git a/docs/source/markdown/podman-machine-set.1.md b/docs/source/markdown/podman-machine-set.1.md index a4918eacf..e69a7dc14 100644 --- a/docs/source/markdown/podman-machine-set.1.md +++ b/docs/source/markdown/podman-machine-set.1.md @@ -19,39 +19,39 @@ subset can be changed after machine initialization. Print usage statement. -#### **--rootful**=*true|false* +#### **--rootfull**=*true|false* -Whether this machine should prefer rootful (`true`) or rootless (`false`) +Whether this machine should prefer rootfull (`true`) or rootless (`false`) container execution. This option will also update the current podman remote connection default if it is currently pointing at the specified machine name (or `podman-machine-default` if no name is specified). Unlike [**podman system connection default**](podman-system-connection-default.1.md) -this option will also make the API socket, if available, forward to the rootful/rootless +this option will also make the API socket, if available, forward to the rootfull/rootless socket in the VM. ## EXAMPLES -To switch the default VM `podman-machine-default` from rootless to rootful: +To switch the default VM `podman-machine-default` from rootless to rootfull: ``` -$ podman machine set --rootful +$ podman machine set --rootfull ``` or more explicitly: ``` -$ podman machine set --rootful=true +$ podman machine set --rootfull=true ``` -To switch the default VM `podman-machine-default` from rootful to rootless: +To switch the default VM `podman-machine-default` from rootfull to rootless: ``` -$ podman machine set --rootful=false +$ podman machine set --rootfull=false ``` -To switch the VM `myvm` from rootless to rootful: +To switch the VM `myvm` from rootless to rootfull: ``` -$ podman machine set --rootful myvm +$ podman machine set --rootfull myvm ``` ## SEE ALSO |