docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3844 from clkao/lxc-kill-deprecation 

Use lxc-stop -k instead of lxc-kill
This commit is contained in:
Michael Crosby 2014-01-31 10:57:40 -08:00
parent 643c7dc25d b111fc3646
commit f267938fb8
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
execdriver/lxc/driver.go
View File

@ -214,7 +214,16 @@ func (d *driver) version() string {
} }
func (d *driver) kill(c *execdriver.Command, sig int) error { func (d *driver) kill(c *execdriver.Command, sig int) error {
output, err := exec.Command("lxc-kill", "-n", c.ID, strconv.Itoa(sig)).CombinedOutput() var (
err error
output []byte
)
_, err = exec.LookPath("lxc-kill")
if err == nil {
output, err = exec.Command("lxc-kill", "-n", c.ID, strconv.Itoa(sig)).CombinedOutput()
} else {
output, err = exec.Command("lxc-stop", "-k", "-n", c.ID, strconv.Itoa(sig)).CombinedOutput()
}
if err != nil { if err != nil {
return fmt.Errorf("Err: %s Output: %s", err, output) return fmt.Errorf("Err: %s Output: %s", err, output)
} }