mirror of https://github.com/docker/docs.git
Merge pull request #3637 from crosbymichael/no-panic-on-exec
Return error and not panic when cannot exec in dockerinit
This commit is contained in:
commit
b4e5bfbf6f
|
@ -209,7 +209,7 @@ func executeProgram(args *DockerInitArgs) error {
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := syscall.Exec(path, args.args, os.Environ()); err != nil {
|
if err := syscall.Exec(path, args.args, os.Environ()); err != nil {
|
||||||
panic(err)
|
return fmt.Errorf("dockerinit unable to execute %s - %s", path, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Will never reach here
|
// Will never reach here
|
||||||
|
|
Loading…
Reference in New Issue