From 0aef38f7a21d9d0cd2892b6a3f1b144511d3f5f6 Mon Sep 17 00:00:00 2001
From: unclejack <unclejacksons@gmail.com>
Date: Tue, 11 Nov 2014 13:02:14 +0200
Subject: [PATCH] don't call reexec.Init from chrootarchive

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 8d90b0faf8e289edc2b4c13c6f312995745f161b
Component: engine
---
 components/engine/daemon/graphdriver/aufs/aufs_test.go | 10 ++++++++--
 components/engine/daemon/graphdriver/vfs/vfs_test.go   |  9 ++++++++-
 components/engine/graph/pools_test.go                  | 10 +++++++++-
 components/engine/pkg/chrootarchive/archive_test.go    |  5 +++++
 components/engine/pkg/chrootarchive/init.go            |  1 -
 5 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/components/engine/daemon/graphdriver/aufs/aufs_test.go b/components/engine/daemon/graphdriver/aufs/aufs_test.go
index cc5b3a2030..0c940bc9ed 100644
--- a/components/engine/daemon/graphdriver/aufs/aufs_test.go
+++ b/components/engine/daemon/graphdriver/aufs/aufs_test.go
@@ -4,18 +4,24 @@ import (
 	"crypto/sha256"
 	"encoding/hex"
 	"fmt"
-	"github.com/docker/docker/daemon/graphdriver"
-	"github.com/docker/docker/pkg/archive"
 	"io/ioutil"
 	"os"
 	"path"
 	"testing"
+
+	"github.com/docker/docker/daemon/graphdriver"
+	"github.com/docker/docker/pkg/archive"
+	"github.com/docker/docker/pkg/reexec"
 )
 
 var (
 	tmp = path.Join(os.TempDir(), "aufs-tests", "aufs")
 )
 
+func init() {
+	reexec.Init()
+}
+
 func testInit(dir string, t *testing.T) graphdriver.Driver {
 	d, err := Init(dir, nil)
 	if err != nil {
diff --git a/components/engine/daemon/graphdriver/vfs/vfs_test.go b/components/engine/daemon/graphdriver/vfs/vfs_test.go
index eaf70f59d3..1ee6ae4a90 100644
--- a/components/engine/daemon/graphdriver/vfs/vfs_test.go
+++ b/components/engine/daemon/graphdriver/vfs/vfs_test.go
@@ -1,10 +1,17 @@
 package vfs
 
 import (
-	"github.com/docker/docker/daemon/graphdriver/graphtest"
 	"testing"
+
+	"github.com/docker/docker/daemon/graphdriver/graphtest"
+
+	"github.com/docker/docker/pkg/reexec"
 )
 
+func init() {
+	reexec.Init()
+}
+
 // This avoids creating a new driver for each test if all tests are run
 // Make sure to put new tests between TestVfsSetup and TestVfsTeardown
 func TestVfsSetup(t *testing.T) {
diff --git a/components/engine/graph/pools_test.go b/components/engine/graph/pools_test.go
index 785a4bd122..129a5e1fec 100644
--- a/components/engine/graph/pools_test.go
+++ b/components/engine/graph/pools_test.go
@@ -1,6 +1,14 @@
 package graph
 
-import "testing"
+import (
+	"testing"
+
+	"github.com/docker/docker/pkg/reexec"
+)
+
+func init() {
+	reexec.Init()
+}
 
 func TestPools(t *testing.T) {
 	s := &TagStore{
diff --git a/components/engine/pkg/chrootarchive/archive_test.go b/components/engine/pkg/chrootarchive/archive_test.go
index aeac448743..69e18e3199 100644
--- a/components/engine/pkg/chrootarchive/archive_test.go
+++ b/components/engine/pkg/chrootarchive/archive_test.go
@@ -7,8 +7,13 @@ import (
 	"testing"
 
 	"github.com/docker/docker/pkg/archive"
+	"github.com/docker/docker/pkg/reexec"
 )
 
+func init() {
+	reexec.Init()
+}
+
 func TestChrootTarUntar(t *testing.T) {
 	tmpdir, err := ioutil.TempDir("", "docker-TestChrootTarUntar")
 	if err != nil {
diff --git a/components/engine/pkg/chrootarchive/init.go b/components/engine/pkg/chrootarchive/init.go
index f05698f65b..b548e9fe72 100644
--- a/components/engine/pkg/chrootarchive/init.go
+++ b/components/engine/pkg/chrootarchive/init.go
@@ -10,7 +10,6 @@ import (
 func init() {
 	reexec.Register("docker-untar", untar)
 	reexec.Register("docker-applyLayer", applyLayer)
-	reexec.Init()
 }
 
 func fatal(err error) {