Merge pull request cri-o#305 from cyphar/runc-kill-arguments

Mrunal Patel · web-flow · commit c0e3c08a172a · 2017-01-02T09:39:35.000-08:00
oci: fix runc kill usage
diff --git a/oci/oci.go b/oci/oci.go
@@ -275,7 +275,7 @@ func (r *Runtime) ExecSync(c *Container, command []string, timeout int64) (resp
 func (r *Runtime) StopContainer(c *Container) error {
 	c.opLock.Lock()
 	defer c.opLock.Unlock()
-	if err := utils.ExecCmdWithStdStreams(os.Stdin, os.Stdout, os.Stderr, r.path, "kill", c.name); err != nil {
+	if err := utils.ExecCmdWithStdStreams(os.Stdin, os.Stdout, os.Stderr, r.path, "kill", c.name, "TERM"); err != nil {
 		return err
 	}
 	i := 0

Original file line number	Diff line number	Diff line change
`@@ -275,7 +275,7 @@ func (r Runtime) ExecSync(c Container, command []string, timeout int64) (resp`
`275`	`275`	`func (r Runtime) StopContainer(c Container) error {`
`276`	`276`	`c.opLock.Lock()`
`277`	`277`	`defer c.opLock.Unlock()`
`278`		`- if err := utils.ExecCmdWithStdStreams(os.Stdin, os.Stdout, os.Stderr, r.path, "kill", c.name); err != nil {`
	`278`	`+ if err := utils.ExecCmdWithStdStreams(os.Stdin, os.Stdout, os.Stderr, r.path, "kill", c.name, "TERM"); err != nil {`
`279`	`279`	`return err`
`280`	`280`	`}`
`281`	`281`	`i := 0`