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

Factor out some leftover direct references to runc binary

Browse source 
Signed-off-by: Tibor Vass <tibor@docker.com>
This commit is contained in:
Tibor Vass 2016-03-22 12:01:21 -04:00
parent d0f2c32679
commit 2406bbc1ca
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
containerd-shim/process.go
View file

@ -139,7 +139,7 @@ func (p *process) start() 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("runc not installed on system") return fmt.Errorf("%s not installed on system", p.runtime)
} }
} }
return err return err

2
runtime/container_linux.go
View file

@ -120,7 +120,7 @@ func (c *container) Checkpoint(cpt Checkpoint) error {
add("--ext-unix-sk") add("--ext-unix-sk")
} }
add(c.id) add(c.id)
return exec.Command("runc", args...).Run() return exec.Command(c.runtime, args...).Run()
} }
func (c *container) DeleteCheckpoint(name string) error { func (c *container) DeleteCheckpoint(name string) error {