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

4
server/server.go
View file

@ -107,7 +107,7 @@ func (s *Server) releasePodName(name string) {
}
// New creates a new Server with options provided
func New(runtimePath, root, sandboxDir, containerDir string) (*Server, error) {
func New(runtimePath, root, sandboxDir, containerDir string, conmonPath string) (*Server, error) {
// TODO: This will go away later when we have wrapper process or systemd acting as
// subreaper.
if err := utils.SetSubreaper(1); err != nil {
@ -124,7 +124,7 @@ func New(runtimePath, root, sandboxDir, containerDir string) (*Server, error) {
return nil, err
}
r, err := oci.New(runtimePath, containerDir)
r, err := oci.New(runtimePath, containerDir, conmonPath)
if err != nil {
return nil, err
}