@@ -13,7 +13,7 @@ import (

 	"strings"

 	"syscall"

-	"github.com/docker/docker/reexec"

+	"github.com/docker/docker/pkg/reexec"

 	"github.com/docker/libcontainer/netlink"

 )

@@ -11,7 +11,7 @@ import (

 	"runtime"

 	"github.com/docker/docker/daemon/execdriver"

-	"github.com/docker/docker/reexec"

+	"github.com/docker/docker/pkg/reexec"

 	"github.com/docker/libcontainer"

 	"github.com/docker/libcontainer/namespaces"

 )

@@ -10,7 +10,7 @@ import (

 	"path/filepath"

 	"runtime"

-	"github.com/docker/docker/reexec"

+	"github.com/docker/docker/pkg/reexec"

 	"github.com/docker/libcontainer"

 	"github.com/docker/libcontainer/namespaces"

 	"github.com/docker/libcontainer/syncpipe"

@@ -14,7 +14,7 @@ import (

 	"time"

 	"github.com/docker/docker/pkg/proxy"

-	"github.com/docker/docker/reexec"

+	"github.com/docker/docker/pkg/reexec"

 )

 const userlandProxyCommandName = "docker-proxy"

@@ -13,7 +13,7 @@ import (

 	"github.com/docker/docker/api/client"

 	"github.com/docker/docker/dockerversion"

 	flag "github.com/docker/docker/pkg/mflag"

-	"github.com/docker/docker/reexec"

+	"github.com/docker/docker/pkg/reexec"

 	"github.com/docker/docker/utils"

 )

@@ -3,7 +3,7 @@ package main

 import (

 	_ "github.com/docker/docker/daemon/execdriver/lxc"

 	_ "github.com/docker/docker/daemon/execdriver/native"

-	"github.com/docker/docker/reexec"

+	"github.com/docker/docker/pkg/reexec"

 )

 func main() {

@@ -22,7 +22,7 @@ import (

 	"github.com/docker/docker/image"

 	"github.com/docker/docker/nat"

 	"github.com/docker/docker/pkg/ioutils"

-	"github.com/docker/docker/reexec"

+	"github.com/docker/docker/pkg/reexec"

 	"github.com/docker/docker/runconfig"

 	"github.com/docker/docker/utils"

 )

new file mode 100644

@@ -0,0 +1 @@

+Michael Crosby <michael@docker.com> (@crosbymichael)

new file mode 100644

@@ -0,0 +1,5 @@

+## reexec

+

+The `reexec` package facilitates the busybox style reexec of the docker binary that we require because 

+of the forking limitations of using Go.  Handlers can be registered with a name and the argv 0 of 

+the exec of the binary will be used to find and execute custom init paths.

new file mode 100644

@@ -0,0 +1,45 @@

+package reexec

+

+import (

+	"fmt"

+	"os"

+	"os/exec"

+	"path/filepath"

+)

+

+var registeredInitializers = make(map[string]func())

+

+// Register adds an initialization func under the specified name

+func Register(name string, initializer func()) {

+	if _, exists := registeredInitializers[name]; exists {

+		panic(fmt.Sprintf("reexec func already registred under name %q", name))

+	}

+

+	registeredInitializers[name] = initializer

+}

+

+// Init is called as the first part of the exec process and returns true if an

+// initialization function was called.

+func Init() bool {

+	initializer, exists := registeredInitializers[os.Args[0]]

+	if exists {

+		initializer()

+

+		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

+}

deleted file mode 100644

@@ -1,5 +0,0 @@

-## reexec

-

-The `reexec` package facilitates the busybox style reexec of the docker binary that we require because 

-of the forking limitations of using Go.  Handlers can be registered with a name and the argv 0 of 

-the exec of the binary will be used to find and execute custom init paths.

deleted file mode 100644

@@ -1,45 +0,0 @@

-package reexec

-

-import (

-	"fmt"

-	"os"

-	"os/exec"

-	"path/filepath"

-)

-

-var registeredInitializers = make(map[string]func())

-

-// Register adds an initialization func under the specified name

-func Register(name string, initializer func()) {

-	if _, exists := registeredInitializers[name]; exists {

-		panic(fmt.Sprintf("reexec func already registred under name %q", name))

-	}

-

-	registeredInitializers[name] = initializer

-}

-

-// Init is called as the first part of the exec process and returns true if an

-// initialization function was called.

-func Init() bool {

-	initializer, exists := registeredInitializers[os.Args[0]]

-	if exists {

-		initializer()

-

-		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

-}