Browse code

Update lxc with libcontainer SetupUser change

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Michael Crosby authored on 2015/01/13 03:43:33
Showing 1 changed files
... ...
@@ -2,6 +2,8 @@ package lxc
2 2
 
3 3
 import (
4 4
 	"fmt"
5
+
6
+	"github.com/docker/libcontainer"
5 7
 	"github.com/docker/libcontainer/namespaces"
6 8
 	"github.com/docker/libcontainer/utils"
7 9
 )
... ...
@@ -10,14 +12,13 @@ func finalizeNamespace(args *InitArgs) error {
10 10
 	if err := utils.CloseExecFrom(3); err != nil {
11 11
 		return err
12 12
 	}
13
-
14
-	if err := namespaces.SetupUser(args.User); err != nil {
13
+	if err := namespaces.SetupUser(&libcontainer.Config{
14
+		User: args.User,
15
+	}); err != nil {
15 16
 		return fmt.Errorf("setup user %s", err)
16 17
 	}
17
-
18 18
 	if err := setupWorkingDirectory(args); err != nil {
19 19
 		return err
20 20
 	}
21
-
22 21
 	return nil
23 22
 }