github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Include extension for shim binary format on Windows

Browse Source 
Use full name including extension for shim binary format on Windows in order to
match any stat path faster without a fallback.

Signed-off-by: Justin Terry (VM) <juterry@microsoft.com>
This commit is contained in:
Justin Terry (VM) 2019-01-28 12:41:50 -08:00
parent 4259f63e04
commit 764afa0d18
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/v2/shim/util.go
View File

@ -31,8 +31,6 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
) )
const shimBinaryFormat = "containerd-shim-%s-%s"
var runtimePaths sync.Map var runtimePaths sync.Map
// Command returns the shim command with the provided args and configuration // Command returns the shim command with the provided args and configuration

2
runtime/v2/shim/util_unix.go
View File

@ -31,6 +31,8 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
) )
const shimBinaryFormat = "containerd-shim-%s-%s"
func getSysProcAttr() *syscall.SysProcAttr { func getSysProcAttr() *syscall.SysProcAttr {
return &syscall.SysProcAttr{ return &syscall.SysProcAttr{
Setpgid: true, Setpgid: true,

2
runtime/v2/shim/util_windows.go
View File

@ -29,6 +29,8 @@ import (
"github.com/pkg/errors" "github.com/pkg/errors"
) )
const shimBinaryFormat = "containerd-shim-%s-%s.exe"
func getSysProcAttr() *syscall.SysProcAttr { func getSysProcAttr() *syscall.SysProcAttr {
return nil return nil
} }