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

10
cmd/server/main.go
View file

@ -14,7 +14,8 @@ import (
)
const (
ocidRoot = "/var/lib/ocid"
ocidRoot = "/var/lib/ocid"
conmonPath = "/usr/libexec/ocid/conmon"
)
func main() {
@ -24,6 +25,11 @@ func main() {
app.Version = "0.0.1"
app.Flags = []cli.Flag{
cli.StringFlag{
Name: "conmon",
Value: conmonPath,
Usage: "path to the conmon executable",
},
cli.StringFlag{
Name: "root",
Value: ocidRoot,
@ -104,7 +110,7 @@ func main() {
containerDir := c.String("containerdir")
sandboxDir := c.String("sandboxdir")
service, err := server.New(c.String("runtime"), c.String("root"), sandboxDir, containerDir)
service, err := server.New(c.String("runtime"), c.String("root"), sandboxDir, containerDir, conmonPath)
if err != nil {
logrus.Fatal(err)
}