github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-26 04:03:11 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1573 from riyazdf/qemu-err-catch

Browse Source 
qemu: catch error on disk create and exit with message
This commit is contained in:
Justin Cormack 2017-04-10 20:54:03 +01:00 committed by GitHub
commit 67619d751b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/cmd/moby/run_qemu.go
View File

@ -82,7 +82,9 @@ func runQemu(args []string) {
log.Fatalf("Unable to find %s within the $PATH", qemuImgPath) log.Fatalf("Unable to find %s within the $PATH", qemuImgPath)
} }
cmd := exec.Command(fullQemuImgPath, "create", "-f", "qcow2", *qemuDiskPath, *qemuDiskSize) cmd := exec.Command(fullQemuImgPath, "create", "-f", "qcow2", *qemuDiskPath, *qemuDiskSize)
cmd.Run() if err = cmd.Run(); err != nil {
log.Fatalf("Error creating disk [%s]: %s", *qemuDiskPath, err.Error())
}
} else { } else {
log.Infof("Using existing disk [%s]", *qemuDiskPath) log.Infof("Using existing disk [%s]", *qemuDiskPath)
} }
@ -145,10 +147,8 @@ func runQemu(args []string) {
cmd.Stderr = os.Stderr cmd.Stderr = os.Stderr
} }
err = cmd.Run() if err = cmd.Run(); err != nil {
log.Fatalf("Error starting %s: %s", fullQemuPath, err.Error())
if err != nil {
log.Fatalf("Error starting %s\nError: %s", fullQemuPath, err.Error())
} }
} }