github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-22 02:21:34 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1871 from justincormack/qemu-img-container-fix

Browse Source 
Fixes for running qemu-img in a container
This commit is contained in:
Justin Cormack 2017-05-22 15:01:42 +01:00 committed by GitHub
commit 11dfad05d6
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cmd/linuxkit/run_qemu.go
View File

@ -185,6 +185,7 @@ func runQemuContainer(config QemuConfig) error {
config, args = buildQemuCmdline(config) config, args = buildQemuCmdline(config)
dockerArgs := []string{"run", "--interactive", "--rm", "-v", fmt.Sprintf("%s:%s", wd, "/tmp"), "-w", "/tmp"} 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())) { if terminal.IsTerminal(int(os.Stdin.Fd())) {
dockerArgs = append(dockerArgs, "--tty") dockerArgs = append(dockerArgs, "--tty")
@ -212,8 +213,9 @@ func runQemuContainer(config QemuConfig) error {
if _, err = os.Stat(config.DiskPath); err != nil { if _, err = os.Stat(config.DiskPath); err != nil {
if os.IsNotExist(err) { if os.IsNotExist(err) {
log.Infof("Creating new qemu disk [%s] format %s", config.DiskPath, config.DiskFormat) 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 := exec.Command(dockerPath, imgArgs...)
qemuImgCmd.Stderr = os.Stderr
log.Debugf("%v\n", qemuImgCmd.Args) log.Debugf("%v\n", qemuImgCmd.Args)
if err = qemuImgCmd.Run(); err != nil { if err = qemuImgCmd.Run(); err != nil {
return fmt.Errorf("Error creating disk [%s] format %s: %s", config.DiskPath, config.DiskFormat, err.Error()) return fmt.Errorf("Error creating disk [%s] format %s: %s", config.DiskPath, config.DiskFormat, err.Error())