From 1e81387edcab600c9b8bc2a502988f7b3a2013e7 Mon Sep 17 00:00:00 2001
From: Michael Crosby <michael@crosbymichael.com>
Date: Mon, 13 Jan 2014 15:09:41 -0800
Subject: [PATCH] Remove SysinitPath from process

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
---
 container.go             | 23 +++++++++++------------
 execdriver/driver.go     | 23 +++++++++++------------
 execdriver/lxc/driver.go |  1 +
 3 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/container.go b/container.go
index 9fac0da587..424c9d5f1f 100644
--- a/container.go
+++ b/container.go
@@ -675,18 +675,17 @@ func (container *Container) Start() (err error) {
 	}
 
 	container.process = &execdriver.Process{
-		ID:          container.ID,
-		Privileged:  container.hostConfig.Privileged,
-		Rootfs:      root,
-		InitPath:    "/.dockerinit",
-		Entrypoint:  container.Path,
-		Arguments:   container.Args,
-		WorkingDir:  workingDir,
-		ConfigPath:  container.lxcConfigPath(),
-		Network:     en,
-		Tty:         container.Config.Tty,
-		User:        container.Config.User,
-		SysInitPath: runtime.sysInitPath,
+		ID:         container.ID,
+		Privileged: container.hostConfig.Privileged,
+		Rootfs:     root,
+		InitPath:   "/.dockerinit",
+		Entrypoint: container.Path,
+		Arguments:  container.Args,
+		WorkingDir: workingDir,
+		ConfigPath: container.lxcConfigPath(),
+		Network:    en,
+		Tty:        container.Config.Tty,
+		User:       container.Config.User,
 	}
 	container.process.SysProcAttr = &syscall.SysProcAttr{Setsid: true}
 
diff --git a/execdriver/driver.go b/execdriver/driver.go
index c38dc96a91..cb9df96e79 100644
--- a/execdriver/driver.go
+++ b/execdriver/driver.go
@@ -29,18 +29,17 @@ type Network struct {
 type Process struct {
 	exec.Cmd
 
-	ID          string
-	Privileged  bool
-	User        string
-	Rootfs      string // root fs of the container
-	InitPath    string // dockerinit
-	Entrypoint  string
-	Arguments   []string
-	WorkingDir  string
-	ConfigPath  string
-	Tty         bool
-	Network     *Network // if network is nil then networking is disabled
-	SysInitPath string
+	ID         string
+	Privileged bool
+	User       string
+	Rootfs     string // root fs of the container
+	InitPath   string // dockerinit
+	Entrypoint string
+	Arguments  []string
+	WorkingDir string
+	ConfigPath string
+	Tty        bool
+	Network    *Network // if network is nil then networking is disabled
 }
 
 func (c *Process) Pid() int {
diff --git a/execdriver/lxc/driver.go b/execdriver/lxc/driver.go
index 5ab6f8b824..b220ff146e 100644
--- a/execdriver/lxc/driver.go
+++ b/execdriver/lxc/driver.go
@@ -256,6 +256,7 @@ func linkLxcStart(root string) error {
 	return os.Symlink(sourcePath, targetPath)
 }
 
+// TODO: This can be moved to the mountinfo reader in the mount pkg
 func rootIsShared() bool {
 	if data, err := ioutil.ReadFile("/proc/self/mountinfo"); err == nil {
 		for _, line := range strings.Split(string(data), "\n") {