vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

don't call reexec.Init from chrootarchive

Browse source 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
This commit is contained in:
unclejack 2014-11-11 13:02:14 +02:00
parent 57f40e0735
commit d729913f31
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
chrootarchive/archive_test.go
View file

@ -7,8 +7,13 @@ import (
"testing" "testing"
"github.com/docker/docker/pkg/archive" "github.com/docker/docker/pkg/archive"
"github.com/docker/docker/pkg/reexec"
) )
func init() {
reexec.Init()
}
func TestChrootTarUntar(t *testing.T) { func TestChrootTarUntar(t *testing.T) {
tmpdir, err := ioutil.TempDir("", "docker-TestChrootTarUntar") tmpdir, err := ioutil.TempDir("", "docker-TestChrootTarUntar")
if err != nil { if err != nil {

1
chrootarchive/init.go
View file

@ -10,7 +10,6 @@ import (
func init() { func init() {
reexec.Register("docker-untar", untar) reexec.Register("docker-untar", untar)
reexec.Register("docker-applyLayer", applyLayer) reexec.Register("docker-applyLayer", applyLayer)
reexec.Init()
} }
func fatal(err error) { func fatal(err error) {