Merge pull request #3637 from crosbymichael/no-panic-on-exec
Return error and not panic when cannot exec in dockerinit Upstream-commit: b4e5bfbf6f17b92a12ed2a8f4fafab53fac5f0ad Component: engine
This commit is contained in:
@ -209,7 +209,7 @@ func executeProgram(args *DockerInitArgs) error {
|
||||
}
|
||||
|
||||
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
|
||||
|
||||
Reference in New Issue
Block a user