containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary part of paths to lxc executables

This commit is contained in:
Maxim Treskin 2013-03-29 12:07:25 +07:00
parent 839c9c035a
commit cf1721909d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
storage/container.go
View File

@ -245,7 +245,7 @@ func (container *Container) Start() error {
params = append(params, "--", container.Path) params = append(params, "--", container.Path)
params = append(params, container.Args...) params = append(params, container.Args...)
container.cmd = exec.Command("/usr/bin/lxc-start", params...) container.cmd = exec.Command("lxc-start", params...)
// Setup environment // Setup environment
container.cmd.Env = append( container.cmd.Env = append(
@ -396,7 +396,7 @@ func (container *Container) Stop() error {
} }
// 1. Send a SIGTERM // 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(string(output))
log.Printf("Failed to send SIGTERM to the process, force killing") log.Printf("Failed to send SIGTERM to the process, force killing")
if err := container.Kill(); err != nil { if err := container.Kill(); err != nil {