From 8afd318e979a550451399b0594ade98f1b29093a Mon Sep 17 00:00:00 2001 From: Justin Cormack Date: Mon, 22 May 2017 14:36:00 +0100 Subject: [PATCH] Fixes for running qemu-img in a container - show errors by outputting stderr - as no input is wired up, fails as requests a tty, so don't do that Signed-off-by: Justin Cormack --- src/cmd/linuxkit/run_qemu.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/cmd/linuxkit/run_qemu.go b/src/cmd/linuxkit/run_qemu.go index beb8ce05b..251c86cc9 100644 --- a/src/cmd/linuxkit/run_qemu.go +++ b/src/cmd/linuxkit/run_qemu.go @@ -185,6 +185,7 @@ func runQemuContainer(config QemuConfig) error { config, args = buildQemuCmdline(config) dockerArgs := []string{"run", "--interactive", "--rm", "-v", fmt.Sprintf("%s:%s", wd, "/tmp"), "-w", "/tmp"} + dockerArgsImg := []string{"run", "--rm", "-v", fmt.Sprintf("%s:%s", wd, "/tmp"), "-w", "/tmp"} if terminal.IsTerminal(int(os.Stdin.Fd())) { dockerArgs = append(dockerArgs, "--tty") @@ -212,8 +213,9 @@ func runQemuContainer(config QemuConfig) error { if _, err = os.Stat(config.DiskPath); err != nil { if os.IsNotExist(err) { log.Infof("Creating new qemu disk [%s] format %s", config.DiskPath, config.DiskFormat) - imgArgs := append(dockerArgs, QemuImg, "qemu-img", "create", "-f", config.DiskFormat, config.DiskPath, config.DiskSize) + imgArgs := append(dockerArgsImg, QemuImg, "qemu-img", "create", "-f", config.DiskFormat, config.DiskPath, config.DiskSize) qemuImgCmd := exec.Command(dockerPath, imgArgs...) + qemuImgCmd.Stderr = os.Stderr log.Debugf("%v\n", qemuImgCmd.Args) if err = qemuImgCmd.Run(); err != nil { return fmt.Errorf("Error creating disk [%s] format %s: %s", config.DiskPath, config.DiskFormat, err.Error())