From d5112ffce60625e470515578ccd446a191dd9e88 Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Fri, 17 Jan 2014 16:53:13 -0800 Subject: [PATCH] Fix rebase for init error Docker-DCO-1.1-Signed-off-by: Michael Crosby (github: crosbymichael) --- execdriver/lxc/driver.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/execdriver/lxc/driver.go b/execdriver/lxc/driver.go index eeef1f5370..2a6663117a 100644 --- a/execdriver/lxc/driver.go +++ b/execdriver/lxc/driver.go @@ -43,7 +43,7 @@ func init() { os.Exit(127) } if err := syscall.Exec(path, args.Args, os.Environ()); err != nil { - panic(err) + return fmt.Errorf("dockerinit unable to execute %s - %s", path, err) } panic("Unreachable") })