Update lxc with libcontainer SetupUser change

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 582a79f00a1d87ba0debd8f3785d867c02451e5f
Component: engine
This commit is contained in:
Michael Crosby
2015-01-12 10:43:33 -08:00
parent c9c0b0be61
commit c0b5b7e2d2

View File

@ -2,6 +2,8 @@ package lxc
import (
"fmt"
"github.com/docker/libcontainer"
"github.com/docker/libcontainer/namespaces"
"github.com/docker/libcontainer/utils"
)
@ -10,14 +12,13 @@ func finalizeNamespace(args *InitArgs) error {
if err := utils.CloseExecFrom(3); err != nil {
return err
}
if err := namespaces.SetupUser(args.User); err != nil {
if err := namespaces.SetupUser(&libcontainer.Config{
User: args.User,
}); err != nil {
return fmt.Errorf("setup user %s", err)
}
if err := setupWorkingDirectory(args); err != nil {
return err
}
return nil
}