From 54030128e3e10d7dd9261810d3f3513f6af1e917 Mon Sep 17 00:00:00 2001
From: Albert Zhang <zhgwenming@gmail.com>
Date: Tue, 3 Jun 2014 15:46:01 +0800
Subject: [PATCH] mount of /.dockerinit is not needed for native driver, so
 move it into lxc driver

Docker-DCO-1.1-Signed-off-by: Albert Zhang <zhgwenming@gmail.com> (github: zhgwenming)
Upstream-commit: b611198d286d2f4ebd7526c623dff8e523691698
Component: engine
---
 .../engine/daemon/execdriver/execdrivers/execdrivers.go      | 2 +-
 components/engine/daemon/execdriver/lxc/driver.go            | 5 ++++-
 components/engine/daemon/volumes.go                          | 1 -
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/components/engine/daemon/execdriver/execdrivers/execdrivers.go b/components/engine/daemon/execdriver/execdrivers/execdrivers.go
index 2e18454a09..f43514408b 100644
--- a/components/engine/daemon/execdriver/execdrivers/execdrivers.go
+++ b/components/engine/daemon/execdriver/execdrivers/execdrivers.go
@@ -15,7 +15,7 @@ func NewDriver(name, root, initPath string, sysInfo *sysinfo.SysInfo) (execdrive
 		// we want to give the lxc driver the full docker root because it needs
 		// to access and write config and template files in /var/lib/docker/containers/*
 		// to be backwards compatible
-		return lxc.NewDriver(root, sysInfo.AppArmor)
+		return lxc.NewDriver(root, initPath, sysInfo.AppArmor)
 	case "native":
 		return native.NewDriver(path.Join(root, "execdriver", "native"), initPath)
 	}
diff --git a/components/engine/daemon/execdriver/lxc/driver.go b/components/engine/daemon/execdriver/lxc/driver.go
index 59daf1afe1..d4a00dcca6 100644
--- a/components/engine/daemon/execdriver/lxc/driver.go
+++ b/components/engine/daemon/execdriver/lxc/driver.go
@@ -54,11 +54,12 @@ func init() {
 
 type driver struct {
 	root       string // root path for the driver to use
+	initPath   string
 	apparmor   bool
 	sharedRoot bool
 }
 
-func NewDriver(root string, apparmor bool) (*driver, error) {
+func NewDriver(root, initPath string, apparmor bool) (*driver, error) {
 	// setup unconfined symlink
 	if err := linkLxcStart(root); err != nil {
 		return nil, err
@@ -66,6 +67,7 @@ func NewDriver(root string, apparmor bool) (*driver, error) {
 	return &driver{
 		apparmor:   apparmor,
 		root:       root,
+		initPath:   initPath,
 		sharedRoot: rootIsShared(),
 	}, nil
 }
@@ -79,6 +81,7 @@ func (d *driver) Run(c *execdriver.Command, pipes *execdriver.Pipes, startCallba
 	if err := execdriver.SetTerminal(c, pipes); err != nil {
 		return -1, err
 	}
+	c.Mounts = append(c.Mounts, execdriver.Mount{d.initPath, c.InitPath, false, true})
 	if err := d.generateEnvConfig(c); err != nil {
 		return -1, err
 	}
diff --git a/components/engine/daemon/volumes.go b/components/engine/daemon/volumes.go
index f4b3921c9a..1de8ff98ac 100644
--- a/components/engine/daemon/volumes.go
+++ b/components/engine/daemon/volumes.go
@@ -36,7 +36,6 @@ func prepareVolumesForContainer(container *Container) error {
 
 func setupMountsForContainer(container *Container) error {
 	mounts := []execdriver.Mount{
-		{container.daemon.sysInitPath, "/.dockerinit", false, true},
 		{container.ResolvConfPath, "/etc/resolv.conf", false, true},
 	}