浏览代码

Merge pull request #3698 from alexlarsson/fix-shared-root

Fix handling of shared roots
Michael Crosby 11 年之前
父节点
当前提交
f98a596be9
共有 1 个文件被更改,包括 3 次插入3 次删除
  1. 3 3
      execdriver/lxc/driver.go

+ 3 - 3
execdriver/lxc/driver.go

@@ -111,6 +111,9 @@ func (d *driver) Run(c *execdriver.Process, startCallback execdriver.StartCallba
 		params = append(params, "-w", c.WorkingDir)
 		params = append(params, "-w", c.WorkingDir)
 	}
 	}
 
 
+	params = append(params, "--", c.Entrypoint)
+	params = append(params, c.Arguments...)
+
 	if d.sharedRoot {
 	if d.sharedRoot {
 		// lxc-start really needs / to be non-shared, or all kinds of stuff break
 		// lxc-start really needs / to be non-shared, or all kinds of stuff break
 		// when lxc-start unmount things and those unmounts propagate to the main
 		// when lxc-start unmount things and those unmounts propagate to the main
@@ -127,9 +130,6 @@ func (d *driver) Run(c *execdriver.Process, startCallback execdriver.StartCallba
 		}
 		}
 	}
 	}
 
 
-	params = append(params, "--", c.Entrypoint)
-	params = append(params, c.Arguments...)
-
 	var (
 	var (
 		name = params[0]
 		name = params[0]
 		arg  = params[1:]
 		arg  = params[1:]