浏览代码

Update native driver to set RootFs

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Michael Crosby 11 年之前
父节点
当前提交
532c29ef7d
共有 2 个文件被更改,包括 3 次插入2 次删除
  1. 1 0
      daemon/execdriver/native/create.go
  2. 2 2
      daemon/execdriver/native/driver.go

+ 1 - 0
daemon/execdriver/native/create.go

@@ -31,6 +31,7 @@ func (d *driver) createContainer(c *execdriver.Command) (*libcontainer.Config, e
 	container.Cgroups.Name = c.ID
 	container.Cgroups.Name = c.ID
 	container.Cgroups.AllowedDevices = c.AllowedDevices
 	container.Cgroups.AllowedDevices = c.AllowedDevices
 	container.MountConfig.DeviceNodes = c.AutoCreatedDevices
 	container.MountConfig.DeviceNodes = c.AutoCreatedDevices
+	container.RootFs = c.Rootfs
 
 
 	// check to see if we are running in ramdisk to disable pivot root
 	// check to see if we are running in ramdisk to disable pivot root
 	container.MountConfig.NoPivotRoot = os.Getenv("DOCKER_RAMDISK") != ""
 	container.MountConfig.NoPivotRoot = os.Getenv("DOCKER_RAMDISK") != ""

+ 2 - 2
daemon/execdriver/native/driver.go

@@ -100,7 +100,7 @@ func (d *driver) Run(c *execdriver.Command, pipes *execdriver.Pipes, startCallba
 		return -1, err
 		return -1, err
 	}
 	}
 
 
-	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 {
+	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 {
 		c.ProcessConfig.Path = d.initPath
 		c.ProcessConfig.Path = d.initPath
 		c.ProcessConfig.Args = append([]string{
 		c.ProcessConfig.Args = append([]string{
 			DriverName,
 			DriverName,
@@ -117,7 +117,7 @@ func (d *driver) Run(c *execdriver.Command, pipes *execdriver.Pipes, startCallba
 		c.ProcessConfig.ExtraFiles = []*os.File{child}
 		c.ProcessConfig.ExtraFiles = []*os.File{child}
 
 
 		c.ProcessConfig.Env = container.Env
 		c.ProcessConfig.Env = container.Env
-		c.ProcessConfig.Dir = c.Rootfs
+		c.ProcessConfig.Dir = container.RootFs
 
 
 		return &c.ProcessConfig.Cmd
 		return &c.ProcessConfig.Cmd
 	}, func() {
 	}, func() {