Use hyperkit to make raw disks

- enable the hyperkit option by default on MacOS
- use it for creating raw disk images

fix #68

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack
2017-06-15 15:10:55 -07:00
parent d8cc1b3f08
commit 13da5e08ea
2 changed files with 10 additions and 4 deletions

View File

@@ -129,9 +129,14 @@ func outputLinuxKit(format string, filename string, kernel []byte, initrd []byte
return fmt.Errorf("Cannot find linuxkit executable, needed to build %s output type: %v", format, err)
}
commandLine := []string{"-q", "run", "qemu", "-disk", fmt.Sprintf("%s,size=%s,format=%s", filename, sizeString, format), "-disk", fmt.Sprintf("%s,format=raw", tardisk), "-kernel", imageFilename("mkimage")}
// if hyperkit && format == "raw" {
// TODO support hyperkit
// }
if hyperkit && format == "raw" {
state, err := ioutil.TempDir("", "s")
if err != nil {
return err
}
defer os.RemoveAll(state)
commandLine = []string{"-q", "run", "hyperkit", "-state", state, "-disk", fmt.Sprintf("%s,size=%s,format=%s", filename, sizeString, format), "-disk", fmt.Sprintf("%s,format=raw", tardisk), imageFilename("mkimage")}
}
log.Debugf("run %s: %v", linuxkit, commandLine)
cmd := exec.Command(linuxkit, commandLine...)
cmd.Stderr = os.Stderr