toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #250 from metachord/master

Browse Source 
Remove unnecessary path parts
Upstream-commit: f5b458b1dc898862609ad5aadea7321cbec582c6
Component: engine
This commit is contained in:
Solomon Hykes
2013-03-29 13:42:23 -07:00
parent 7e0d305381 2c32113c8a
commit b6985fe801
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/container.go
+2 -2
View File
@@ -245,7 +245,7 @@ func (container *Container) Start() error {
params = append(params, "--", container.Path)
params = append(params, container.Args...)
container.cmd = exec.Command("/usr/bin/lxc-start", params...)
container.cmd = exec.Command("lxc-start", params...)
// Setup environment
container.cmd.Env = append(
@@ -396,7 +396,7 @@ func (container *Container) Stop() error {
}
// 1. Send a SIGTERM
if output, err := exec.Command("/usr/bin/lxc-kill", "-n", container.Id, "15").CombinedOutput(); err != nil {
if output, err := exec.Command("lxc-kill", "-n", container.Id, "15").CombinedOutput(); err != nil {
log.Printf(string(output))
log.Printf("Failed to send SIGTERM to the process, force killing")
if err := container.Kill(); err != nil {