Fix bug in shim path lookup

jterry75 · jterry75 · commit 6ed293ba94a0 · 2019-01-28T14:04:14.000-08:00
Signed-off-by: Justin Terry (VM) &lt;juterry@microsoft.com&gt;
diff --git a/runtime/v2/shim/util.go b/runtime/v2/shim/util.go
@@ -71,9 +71,9 @@ func Command(ctx context.Context, runtime, containerdAddress, path string, cmdAr
 					// execute the shim found there.
 					testPath := filepath.Join(filepath.Dir(self), name)
 					if _, serr := os.Stat(testPath); serr == nil {
-						path = testPath
+						cmdPath = testPath
 					}
-					if path == "" {
+					if cmdPath == "" {
 						return nil, errors.Wrapf(os.ErrNotExist, "runtime %q binary not installed %q", runtime, name)
 					}
 				}

Original file line number	Diff line number	Diff line change
`@@ -71,9 +71,9 @@ func Command(ctx context.Context, runtime, containerdAddress, path string, cmdAr`
`71`	`71`	`// execute the shim found there.`
`72`	`72`	`testPath := filepath.Join(filepath.Dir(self), name)`
`73`	`73`	`if _, serr := os.Stat(testPath); serr == nil {`
`74`		`- path = testPath`
	`74`	`+ cmdPath = testPath`
`75`	`75`	`}`
`76`		`- if path == "" {`
	`76`	`+ if cmdPath == "" {`
`77`	`77`	`return nil, errors.Wrapf(os.ErrNotExist, "runtime %q binary not installed %q", runtime, name)`
`78`	`78`	`}`
`79`	`79`	`}`