Merge pull request #3698 from alexlarsson/fix-shared-root

Fix handling of shared roots
This commit is contained in:
Michael Crosby 2014-01-21 11:09:36 -08:00
Родитель fb919137be 08ab554195
Коммит f98a596be9
1 изменённых файлов: 3 добавлений и 3 удалений

Просмотреть файл

@ -111,6 +111,9 @@ func (d *driver) Run(c *execdriver.Process, startCallback execdriver.StartCallba
params = append(params, "-w", c.WorkingDir)
}
params = append(params, "--", c.Entrypoint)
params = append(params, c.Arguments...)
if d.sharedRoot {
// lxc-start really needs / to be non-shared, or all kinds of stuff break
// when lxc-start unmount things and those unmounts propagate to the main
@ -127,9 +130,6 @@ func (d *driver) Run(c *execdriver.Process, startCallback execdriver.StartCallba
}
}
params = append(params, "--", c.Entrypoint)
params = append(params, c.Arguments...)
var (
name = params[0]
arg = params[1:]