vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Install conmon in /usr/libexec/ocid/conmon

Browse source 
Signed-off-by: Dan Walsh <dwalsh@redhat.com>
This commit is contained in:
Dan Walsh 2016-09-28 15:49:46 -04:00
parent 47c993f2e1
commit f51c98b057
6 changed files with 22 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
oci/oci.go
View file

@ -21,11 +21,12 @@ import (
)
// New creates a new Runtime with options provided
func New(runtimePath string, containerDir string) (*Runtime, error) {
func New(runtimePath string, containerDir string, conmonPath string) (*Runtime, error) {
r := &Runtime{
name: filepath.Base(runtimePath),
path: runtimePath,
containerDir: containerDir,
conmonPath: conmonPath,
}
return r, nil
}
@ -35,6 +36,7 @@ type Runtime struct {
name string
path string
containerDir string
conmonPath string
}
// syncInfo is used to return data from monitor process to daemon
@ -91,7 +93,7 @@ func (r *Runtime) CreateContainer(c *Container) error {
args = append(args, "-t")
}
cmd := exec.Command("conmon", args...)
cmd := exec.Command(r.conmonPath, args...)
cmd.Dir = c.bundlePath
cmd.SysProcAttr = &syscall.SysProcAttr{
Setpgid: true,