浏览代码

Return error and not panic when cannot exec in dockerinit

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Michael Crosby 11 年之前
父节点
当前提交
11ef2f0db4
共有 1 个文件被更改,包括 1 次插入1 次删除
  1. 1 1
      sysinit/sysinit.go

+ 1 - 1
sysinit/sysinit.go

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