Merge pull request #5143 from kevpar/fix-lookpath

Fix error checking when resolving shim binary path
containerd · Mar 9, 2021 · a5d17eb · a5d17eb
2 parents 9ec2778 + c9afc42
commit a5d17eb
Showing 1 changed file with 1 addition and 1 deletion.
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