mirror of
https://github.com/containers/podman.git
synced 2025-06-23 10:38:20 +08:00
Fix spelling "setup" -> "set up" and similar
* Replace "setup", "lookup", "cleanup", "backup" with "set up", "look up", "clean up", "back up" when used as verbs. Replace also variations of those. * Improve language in a few places. Signed-off-by: Erik Sjölund <erik.sjolund@gmail.com>
This commit is contained in:
@ -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)
|
||||
|
Reference in New Issue
Block a user