Merge pull request #9788 from andrewshadura/rootless-friendly-error

[CI:DOCS] rootless: Tell the user what was led to the error, not just what it is
containers · Apr 27, 2021 · abda796 · abda796
2 parents 3148e01 + 09e640d
commit abda796
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pkg/rootless/rootless_linux.go b/pkg/rootless/rootless_linux.go
@@ -116,7 +116,7 @@ func tryMappingTool(uid bool, pid int, hostID int, mappings []idtools.IDMap) err
 	}
 	path, err := exec.LookPath(tool)
 	if err != nil {
-		return errors.Wrapf(err, "cannot find %s", tool)
+		return errors.Wrapf(err, "command required for rootless mode with multiple IDs")
 	}
 
 	appendTriplet := func(l []string, a, b, c int) []string {

diff --git a/troubleshooting.md b/troubleshooting.md
@@ -203,12 +203,12 @@ Rootless Podman requires the newuidmap and newgidmap programs to be installed.
 
 #### Symptom
 
-If you are running Podman or buildah as a not root user, you get an error complaining about
+If you are running Podman or Buildah as a rootless user, you get an error complaining about
 a missing newuidmap executable.
 
 ```
 podman run -ti fedora sh
-cannot find newuidmap: exec: "newuidmap": executable file not found in $PATH
+command required for rootless mode with multiple IDs: exec: "newuidmap": executable file not found in $PATH
 ```
 
 #### Solution