From cab4807e59330ab1cdd6795d174c07e63f6d1f42 Mon Sep 17 00:00:00 2001 From: Riyaz Faizullabhoy Date: Mon, 10 Apr 2017 10:10:31 -0700 Subject: [PATCH] qemu: catch error on disk create and exit with message Signed-off-by: Riyaz Faizullabhoy --- src/cmd/moby/run_qemu.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/cmd/moby/run_qemu.go b/src/cmd/moby/run_qemu.go index 62bf55b8c..f45056d1a 100644 --- a/src/cmd/moby/run_qemu.go +++ b/src/cmd/moby/run_qemu.go @@ -82,7 +82,9 @@ func runQemu(args []string) { log.Fatalf("Unable to find %s within the $PATH", qemuImgPath) } 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 { log.Infof("Using existing disk [%s]", *qemuDiskPath) } @@ -145,10 +147,8 @@ func runQemu(args []string) { cmd.Stderr = os.Stderr } - err = cmd.Run() - - if err != nil { - log.Fatalf("Error starting %s\nError: %s", fullQemuPath, err.Error()) + if err = cmd.Run(); err != nil { + log.Fatalf("Error starting %s: %s", fullQemuPath, err.Error()) } }