From 582a79f00a1d87ba0debd8f3785d867c02451e5f Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Mon, 12 Jan 2015 10:43:33 -0800 Subject: [PATCH] Update lxc with libcontainer SetupUser change Signed-off-by: Michael Crosby --- daemon/execdriver/lxc/lxc_init_linux.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/daemon/execdriver/lxc/lxc_init_linux.go b/daemon/execdriver/lxc/lxc_init_linux.go index 78bdd11fb9..956a283fc2 100644 --- a/daemon/execdriver/lxc/lxc_init_linux.go +++ b/daemon/execdriver/lxc/lxc_init_linux.go @@ -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 }