Browse code

Update native driver to set RootFs

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

Michael Crosby authored on 2014/09/30 06:35:25
Showing 2 changed files
... ...
@@ -31,6 +31,7 @@ func (d *driver) createContainer(c *execdriver.Command) (*libcontainer.Config, e
31 31
 	container.Cgroups.Name = c.ID
32 32
 	container.Cgroups.AllowedDevices = c.AllowedDevices
33 33
 	container.MountConfig.DeviceNodes = c.AutoCreatedDevices
34
+	container.RootFs = c.Rootfs
34 35
 
35 36
 	// check to see if we are running in ramdisk to disable pivot root
36 37
 	container.MountConfig.NoPivotRoot = os.Getenv("DOCKER_RAMDISK") != ""
... ...
@@ -100,7 +100,7 @@ func (d *driver) Run(c *execdriver.Command, pipes *execdriver.Pipes, startCallba
100 100
 		return -1, err
101 101
 	}
102 102
 
103
-	return namespaces.Exec(container, c.ProcessConfig.Stdin, c.ProcessConfig.Stdout, c.ProcessConfig.Stderr, c.ProcessConfig.Console, c.Rootfs, dataPath, args, func(container *libcontainer.Config, console, rootfs, dataPath, init string, child *os.File, args []string) *exec.Cmd {
103
+	return namespaces.Exec(container, c.ProcessConfig.Stdin, c.ProcessConfig.Stdout, c.ProcessConfig.Stderr, c.ProcessConfig.Console, dataPath, args, func(container *libcontainer.Config, console, dataPath, init string, child *os.File, args []string) *exec.Cmd {
104 104
 		c.ProcessConfig.Path = d.initPath
105 105
 		c.ProcessConfig.Args = append([]string{
106 106
 			DriverName,
... ...
@@ -117,7 +117,7 @@ func (d *driver) Run(c *execdriver.Command, pipes *execdriver.Pipes, startCallba
117 117
 		c.ProcessConfig.ExtraFiles = []*os.File{child}
118 118
 
119 119
 		c.ProcessConfig.Env = container.Env
120
-		c.ProcessConfig.Dir = c.Rootfs
120
+		c.ProcessConfig.Dir = container.RootFs
121 121
 
122 122
 		return &c.ProcessConfig.Cmd
123 123
 	}, func() {