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:
Victor Vieux 2014-01-17 10:42:46 -08:00
commit b4e5bfbf6f
1 changed files with 1 additions and 1 deletions

View File

@ -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