github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2026-04-07 15:49:40 +00:00
Code Issues Projects Releases Wiki Activity

Update hyperkit and support multiple disks

Browse Source 
Now hyperkit Go API has multiple disk support, allow using them from linuxkit

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
This commit is contained in:
Justin Cormack
2017-06-15 13:29:07 -07:00
parent d48715cd8c
commit d194cf7cf7
3 changed files with 51 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/cmd/linuxkit/run_hyperkit.go
View File

@@ -102,6 +102,12 @@ func runHyperKit(args []string) {
log.Fatalf("Cannot open cmdline file: %v", err)
}
// Create new HyperKit instance (w/o networking for now)
h, err := hyperkit.New(*hyperkitPath, "", *state)
if err != nil {
log.Fatalln("Error creating hyperkit: ", err)
}
for i, d := range disks {
id := ""
if i != 0 {
@@ -113,17 +119,8 @@ func runHyperKit(args []string) {
if d.Path == "" {
log.Fatalf("disk specified with no size or name")
}
disks[i] = d
}
if len(disks) > 1 {
log.Fatalf("Hyperkit driver currently only supports a single disk")
}
// Create new HyperKit instance (w/o networking for now)
h, err := hyperkit.New(*hyperkitPath, "", *state)
if err != nil {
log.Fatalln("Error creating hyperkit: ", err)
hd := hyperkit.DiskConfig{Path: d.Path, Size: d.Size}
h.Disks = append(h.Disks, hd)
}
if h.VSockPorts, err = stringToIntArray(*vsockports, ","); err != nil {
@@ -173,10 +170,6 @@ func runHyperKit(args []string) {
h.Initrd = prefix + "-initrd.img"
h.VPNKitKey = vpnKitKey
h.UUID = vmUUID
if len(disks) == 1 {
h.DiskImage = disks[0].Path
h.DiskSize = disks[0].Size
}
h.ISOImage = isoPath
h.VSock = true
h.CPUs = *cpus