diff options
| author | openshift-ci[bot] <75433959+openshift-ci[bot]@users.noreply.github.com> | 2022-06-22 20:05:58 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-22 20:05:58 +0000 |
| commit | 0d1fa2b50419236ee46b4daf0c0b6ea97deabcaa (patch) | |
| tree | ca92bc40d4a45c07fc1cb0ad0985f4a1a9011210 /pkg/rootless | |
| parent | ca26d44d3b8e1208dafd0e71caadc6b67ebb52b2 (diff) | |
| parent | aa4279ae151fa9df5245d3e255f3fb929fe2e86c (diff) | |
| download | podman-0d1fa2b50419236ee46b4daf0c0b6ea97deabcaa.tar.gz podman-0d1fa2b50419236ee46b4daf0c0b6ea97deabcaa.tar.bz2 podman-0d1fa2b50419236ee46b4daf0c0b6ea97deabcaa.zip | |
Merge pull request #14658 from eriksjolund/setup_to_set_up
"setup" -> "set up" and similar
Diffstat (limited to 'pkg/rootless')
| -rw-r--r-- | pkg/rootless/rootless_linux.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/rootless/rootless_linux.go b/pkg/rootless/rootless_linux.go index d0bdf0ffe..fde621b72 100644 --- a/pkg/rootless/rootless_linux.go +++ b/pkg/rootless/rootless_linux.go @@ -154,7 +154,7 @@ func tryMappingTool(uid bool, pid int, hostID int, mappings []idtools.IDMap) err if output, err := cmd.CombinedOutput(); err != nil { logrus.Errorf("running `%s`: %s", strings.Join(args, " "), output) - errorStr := fmt.Sprintf("cannot setup namespace using %q", path) + errorStr := fmt.Sprintf("cannot set up namespace using %q", path) if isSet, err := unshare.IsSetID(cmd.Path, mode, cap); err != nil { logrus.Errorf("Failed to check for %s on %s: %v", idtype, path, err) } else if !isSet { @@ -303,7 +303,7 @@ func becomeRootInUserNS(pausePid, fileToRead string, fileOutput *os.File) (_ boo if retErr != nil && pid > 0 { if err := unix.Kill(pid, unix.SIGKILL); err != nil { if err != unix.ESRCH { - logrus.Errorf("Failed to cleanup process %d: %v", pid, err) + logrus.Errorf("Failed to clean up process %d: %v", pid, err) } } C.reexec_in_user_namespace_wait(C.int(pid), 0) |