Fix error checking when resolving shim binary path

kevpar · kevpar · commit c9afc4250ab1 · 2021-03-08T16:24:19.000-08:00
Previously a typo was introduced that caused the wrong error to be
checked against when calling exec.LookPath. This had the effect that
containerd would never locate the shim binary if it was in the same
directory as containerd's binary, but not in PATH.

Signed-off-by: Kevin Parsons &lt;kevpar@microsoft.com&gt;
diff --git a/runtime/v2/shim/util.go b/runtime/v2/shim/util.go
@@ -70,7 +70,7 @@ func Command(ctx context.Context, runtime, containerdAddress, containerdTTRPCAdd
 		}
 
 		if cmdPath == "" {
-			if cmdPath, lerr = exec.LookPath(name); err != nil {
+			if cmdPath, lerr = exec.LookPath(name); lerr != nil {
 				if eerr, ok := lerr.(*exec.Error); ok {
 					if eerr.Err == exec.ErrNotFound {
 						// LookPath only finds current directory matches based on

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ func Command(ctx context.Context, runtime, containerdAddress, containerdTTRPCAdd`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`if cmdPath == "" {`
`73`		`- if cmdPath, lerr = exec.LookPath(name); err != nil {`
	`73`	`+ if cmdPath, lerr = exec.LookPath(name); lerr != nil {`
`74`	`74`	`if eerr, ok := lerr.(*exec.Error); ok {`
`75`	`75`	`if eerr.Err == exec.ErrNotFound {`
`76`	`76`	`// LookPath only finds current directory matches based on`