mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
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
1 changed files with 1 additions and 1 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Reference in a new issue