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 /contrib | |
| 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 'contrib')
| -rwxr-xr-x | contrib/cirrus/logformatter | 2 | ||||
| -rw-r--r-- | contrib/podmanimage/README.md | 2 | ||||
| -rw-r--r-- | contrib/remote/containers.conf | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/contrib/cirrus/logformatter b/contrib/cirrus/logformatter index 05f05dc0b..e45f03df9 100755 --- a/contrib/cirrus/logformatter +++ b/contrib/cirrus/logformatter @@ -207,7 +207,7 @@ END_HTML print { $out_fh } "<pre> <!-- begin processed output -->\n"; - # Assume rootfull prompt, check for rootless (here and in log itself, below) + # Assume rootful prompt, check for rootless (here and in log itself, below) my $Prompt = '#'; $Prompt = '$' if $test_name =~ /rootless/; diff --git a/contrib/podmanimage/README.md b/contrib/podmanimage/README.md index 58c14be72..4f184ca28 100644 --- a/contrib/podmanimage/README.md +++ b/contrib/podmanimage/README.md @@ -70,4 +70,4 @@ file to `/etc/modules.load.d`. See `man modules-load.d` for more details. ### Blog Post with Details -Dan Walsh wrote a blog post on the [Enable Sysadmin](https://www.redhat.com/sysadmin/) site titled [How to use Podman inside of a container](https://www.redhat.com/sysadmin/podman-inside-container). In it, he details how to use these images as a rootfull and as a rootless user. Please refer to this blog for more detailed information. +Dan Walsh wrote a blog post on the [Enable Sysadmin](https://www.redhat.com/sysadmin/) site titled [How to use Podman inside of a container](https://www.redhat.com/sysadmin/podman-inside-container). In it, he details how to use these images as a rootful and as a rootless user. Please refer to this blog for more detailed information. diff --git a/contrib/remote/containers.conf b/contrib/remote/containers.conf index 45f58171a..9b0b62c42 100644 --- a/contrib/remote/containers.conf +++ b/contrib/remote/containers.conf @@ -7,5 +7,5 @@ # Default Remote URI to access the Podman service. # Examples: # remote rootless ssh://engineering.lab.company.com/run/user/1000/podman/podman.sock -# remote rootfull ssh://root@10.10.1.136:22/run/podman/podman.sock +# remote rootful ssh://root@10.10.1.136:22/run/podman/podman.sock # remote_uri= "" |