add pkg/chrootarchive and use it on the daemon

unclejack · unclejack · commit 3223844c2830 · 2014-11-25T01:03:40.000+02:00
Docker-DCO-1.1-Signed-off-by: Cristian Staretu &lt;cristian.staretu@gmail.com&gt; (github: unclejack)

Conflicts:
	builder/internals.go
	daemon/graphdriver/aufs/aufs.go
	daemon/volumes.go
		fixed conflicts in imports
diff --git a/reexec/command_linux.go b/reexec/command_linux.go
@@ -0,0 +1,18 @@
+// +build linux
+
+package reexec
+
+import (
+	"os/exec"
+	"syscall"
+)
+
+func Command(args ...string) *exec.Cmd {
+	return &exec.Cmd{
+		Path: Self(),
+		Args: args,
+		SysProcAttr: &syscall.SysProcAttr{
+			Pdeathsig: syscall.SIGTERM,
+		},
+	}
+}
diff --git a/reexec/command_unsupported.go b/reexec/command_unsupported.go
@@ -0,0 +1,11 @@
+// +build !linux
+
+package reexec
+
+import (
+	"os/exec"
+)
+
+func Command(args ...string) *exec.Cmd {
+	return nil
+}
diff --git a/reexec/reexec.go b/reexec/reexec.go
@@ -27,19 +27,16 @@ func Init() bool {
 
 		return true
 	}
-
 	return false
 }
 
 // Self returns the path to the current processes binary
 func Self() string {
 	name := os.Args[0]
-
 	if filepath.Base(name) == name {
 		if lp, err := exec.LookPath(name); err == nil {
 			name = lp
 		}
 	}
-
 	return name
 }

Original file line number	Diff line number	Diff line change
`@@ -27,19 +27,16 @@ func Init() bool {`
`27`	`27`
`28`	`28`	`return true`
`29`	`29`	`}`
`30`		`-`
`31`	`30`	`return false`
`32`	`31`	`}`
`33`	`32`
`34`	`33`	`// Self returns the path to the current processes binary`
`35`	`34`	`func Self() string {`
`36`	`35`	`name := os.Args[0]`
`37`		`-`
`38`	`36`	`if filepath.Base(name) == name {`
`39`	`37`	`if lp, err := exec.LookPath(name); err == nil {`
`40`	`38`	`name = lp`
`41`	`39`	`}`
`42`	`40`	`}`
`43`		`-`
`44`	`41`	`return name`
`45`	`42`	`}`