diff options
author | Ashley Cui <acui@redhat.com> | 2022-04-25 09:12:45 -0400 |
---|---|---|
committer | Ashley Cui <acui@redhat.com> | 2022-04-25 09:14:04 -0400 |
commit | 1260bf631f523e0708c458596337623977c6ac51 (patch) | |
tree | e621c4cace3beffefa9adf094d55e84a8848d150 /docs/source | |
parent | ba6356280a86531d3cda7016859aef98bb3d8272 (diff) | |
download | podman-1260bf631f523e0708c458596337623977c6ac51.tar.gz podman-1260bf631f523e0708c458596337623977c6ac51.tar.bz2 podman-1260bf631f523e0708c458596337623977c6ac51.zip |
Revert "Switch all rootful to rootfull"
This reverts commit cc3790f332d989440eb1720e24e3619fc97c74ee.
We can't change rootful to rootfull because `rootful` is written into the machine config. Changing this will break json unmarshalling, which will break existing machines.
[NO NEW TESTS NEEDED]
Signed-off-by: Ashley Cui <acui@redhat.com>
Diffstat (limited to 'docs/source')
-rw-r--r-- | docs/source/markdown/podman-build.1.md | 2 | ||||
-rw-r--r-- | docs/source/markdown/podman-image-scp.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 |
4 files changed, 15 insertions, 15 deletions
diff --git a/docs/source/markdown/podman-build.1.md b/docs/source/markdown/podman-build.1.md index 406dfcd89..86801c72f 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 rootfull 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 rootful users. #### **--no-cache** diff --git a/docs/source/markdown/podman-image-scp.1.md b/docs/source/markdown/podman-image-scp.1.md index 6d5a51298..1d902da91 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 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. +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. **podman image scp [GLOBAL OPTIONS]** diff --git a/docs/source/markdown/podman-machine-init.1.md b/docs/source/markdown/podman-machine-init.1.md index e42c5025b..33947bbba 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. -#### **--rootfull**=*true|false* +#### **--rootful**=*true|false* -Whether this machine should prefer rootfull (`true`) or rootless (`false`) +Whether this machine should prefer rootful (`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 --rootfull +$ podman machine init --rootful $ 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 e69a7dc14..a4918eacf 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. -#### **--rootfull**=*true|false* +#### **--rootful**=*true|false* -Whether this machine should prefer rootfull (`true`) or rootless (`false`) +Whether this machine should prefer rootful (`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 rootfull/rootless +this option will also make the API socket, if available, forward to the rootful/rootless socket in the VM. ## EXAMPLES -To switch the default VM `podman-machine-default` from rootless to rootfull: +To switch the default VM `podman-machine-default` from rootless to rootful: ``` -$ podman machine set --rootfull +$ podman machine set --rootful ``` or more explicitly: ``` -$ podman machine set --rootfull=true +$ podman machine set --rootful=true ``` -To switch the default VM `podman-machine-default` from rootfull to rootless: +To switch the default VM `podman-machine-default` from rootful to rootless: ``` -$ podman machine set --rootfull=false +$ podman machine set --rootful=false ``` -To switch the VM `myvm` from rootless to rootfull: +To switch the VM `myvm` from rootless to rootful: ``` -$ podman machine set --rootfull myvm +$ podman machine set --rootful myvm ``` ## SEE ALSO |