vbatts/containerd
1
0
Fork 0
Code Pull requests Releases Activity

Have containerd-shim filename depend on containerd filename

Browse source 
If containerd binary is renamed to docker-containerd, then it should
invoke the docker-containerd-shim binary.

Signed-off-by: Tibor Vass <tibor@docker.com>
This commit is contained in:
Tibor Vass 2016-03-21 21:33:35 -04:00
parent 54c213e8a7
commit b0681dd523
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
runtime/container_linux.go
View file

@ -17,6 +17,8 @@ import (
ocs "github.com/opencontainers/specs/specs-go" ocs "github.com/opencontainers/specs/specs-go"
) )
var shimBinary = os.Args[0] + "-shim"
func getRootIDs(s *specs.Spec) (int, int, error) { func getRootIDs(s *specs.Spec) (int, int, error) {
if s == nil { if s == nil {
return 0, 0, nil return 0, 0, nil
@ -130,7 +132,7 @@ func (c *container) Start(checkpoint string, s Stdio) (Process, error) {
if err := os.Mkdir(processRoot, 0755); err != nil { if err := os.Mkdir(processRoot, 0755); err != nil {
return nil, err return nil, err
} }
cmd := exec.Command("containerd-shim", cmd := exec.Command(shimBinary,
c.id, c.bundle, c.runtime, c.id, c.bundle, c.runtime,
) )
cmd.Dir = processRoot cmd.Dir = processRoot
@ -170,7 +172,7 @@ func (c *container) Exec(pid string, pspec specs.ProcessSpec, s Stdio) (pp Proce
c.RemoveProcess(pid) c.RemoveProcess(pid)
} }
}() }()
cmd := exec.Command("containerd-shim", cmd := exec.Command(shimBinary,
c.id, c.bundle, c.runtime, c.id, c.bundle, c.runtime,
) )
cmd.Dir = processRoot cmd.Dir = processRoot
@ -204,7 +206,7 @@ func (c *container) startCmd(pid string, cmd *exec.Cmd, p *process) error {
if err := cmd.Start(); err != nil { if err := cmd.Start(); err != nil {
if exErr, ok := err.(*exec.Error); ok { if exErr, ok := err.(*exec.Error); ok {
if exErr.Err == exec.ErrNotFound || exErr.Err == os.ErrNotExist { if exErr.Err == exec.ErrNotFound || exErr.Err == os.ErrNotExist {
return fmt.Errorf("containerd-shim not installed on system") return fmt.Errorf("%s not installed on system", shimBinary)
} }
} }
return err return err