From d729913f3159a5290e4607413024da0017d62fa4 Mon Sep 17 00:00:00 2001 From: unclejack 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 (github: unclejack) --- chrootarchive/archive_test.go | 5 +++++ chrootarchive/init.go | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/chrootarchive/archive_test.go b/chrootarchive/archive_test.go index aeac448..69e18e3 100644 --- a/chrootarchive/archive_test.go +++ b/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/chrootarchive/init.go b/chrootarchive/init.go index f05698f..b548e9f 100644 --- a/chrootarchive/init.go +++ b/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) {