From b9bc36a8bb9cb928a0be940e22e77fb851175f87 Mon Sep 17 00:00:00 2001
From: Michael Crosby <michael@crosbymichael.com>
Date: Fri, 21 Feb 2014 16:17:18 -0800
Subject: [PATCH] Use lookup path for init Docker-DCO-1.1-Signed-off-by:
 Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)

---
 libcontainer/nsinit/exec.go |  1 +
 libcontainer/nsinit/init.go | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/libcontainer/nsinit/exec.go b/libcontainer/nsinit/exec.go
index ba548a2..80fe849 100644
--- a/libcontainer/nsinit/exec.go
+++ b/libcontainer/nsinit/exec.go
@@ -230,5 +230,6 @@ func createCommand(container *libcontainer.Container, console, logFile string, p
 	command.SysProcAttr = &syscall.SysProcAttr{
 		Cloneflags: uintptr(getNamespaceFlags(container.Namespaces)),
 	}
+	command.Env = container.Env
 	return command
 }
diff --git a/libcontainer/nsinit/init.go b/libcontainer/nsinit/init.go
index 8fc5f3d..04716ba 100644
--- a/libcontainer/nsinit/init.go
+++ b/libcontainer/nsinit/init.go
@@ -12,6 +12,7 @@ import (
 	"io/ioutil"
 	"log"
 	"os"
+	"os/exec"
 	"path/filepath"
 	"syscall"
 )
@@ -80,8 +81,13 @@ func Init(container *libcontainer.Container, uncleanRootfs, console string, pipe
 			return fmt.Errorf("chdir to %s %s", container.WorkingDir, err)
 		}
 	}
-	log.Printf("execing %s goodbye", args[0])
-	if err := system.Exec(args[0], args[0:], container.Env); err != nil {
+	name, err := exec.LookPath(args[0])
+	if err != nil {
+		return err
+	}
+
+	log.Printf("execing %s goodbye", name)
+	if err := system.Exec(name, args[0:], container.Env); err != nil {
 		return fmt.Errorf("exec %s", err)
 	}
 	panic("unreachable")