VirtualBox: support mounting additional disks

Signed-off-by: Anders F Björklund <anders.f.bjorklund@gmail.com>

Author: afbjorklund

pkg/cidata/cidata.go

@@ -235,6 +235,15 @@ func GenerateISO9660(instDir, name string, y *limayaml.LimaYAML, udpDNSLocalPort
 		args.MountType = "virtiofs"
 	}
 
+	switch *y.VMType {
+	case limayaml.QEMU:
+		args.DiskType = "virtio"
+	case limayaml.VZ:
+		args.DiskType = "virtio"
+	case limayaml.VBOX:
+		args.DiskType = "sata"
+	}
+
 	for i, d := range y.AdditionalDisks {
 		format := true
 		if d.Format != nil {
@@ -246,7 +255,7 @@ func GenerateISO9660(instDir, name string, y *limayaml.LimaYAML, udpDNSLocalPort
 		}
 		args.Disks = append(args.Disks, Disk{
 			Name:   d.Name,
-			Device: diskDeviceNameFromOrder(i),
+			Device: diskDeviceNameFromOrder(args.DiskType, i),
 			Format: format,
 			FSType: fstype,
 			FSArgs: d.FSArgs,
@@ -413,7 +422,10 @@ func getBootCmds(p []limayaml.Provision) []BootCmds {
 	return bootCmds
 }
 
-func diskDeviceNameFromOrder(order int) string {
+func diskDeviceNameFromOrder(diskType string, order int) string {
+	if diskType == "sata" {
+		return fmt.Sprintf("sd%c", int('b')+order)
+	} // diskType == "virtio"
 	return fmt.Sprintf("vd%c", int('b')+order)
 }
 

pkg/cidata/template.go

@@ -62,6 +62,7 @@ type TemplateArgs struct {
 	Mounts                          []Mount
 	MountType                       string
 	Disks                           []Disk
+	DiskType                        string
 	GuestInstallPrefix              string
 	Containerd                      Containerd
 	Networks                        []Network

pkg/vbox/vbox_driver.go

@@ -15,6 +15,7 @@ import (
 	"github.com/lima-vm/lima/pkg/driver"
 	"github.com/lima-vm/lima/pkg/iso9660util"
 	"github.com/lima-vm/lima/pkg/limayaml"
+	"github.com/lima-vm/lima/pkg/store"
 	"github.com/lima-vm/lima/pkg/store/filenames"
 	"github.com/sirupsen/logrus"
 )
@@ -61,6 +62,30 @@ func (l *LimaVBoxDriver) create(ctx context.Context, name string) error {
 
 	baseDisk := filepath.Join(l.Instance.Dir, filenames.BaseDisk)
 	diffDisk := filepath.Join(l.Instance.Dir, filenames.DiffDisk)
+	extraDisks := []string{}
+	if len(l.Instance.AdditionalDisks) > 0 {
+		for _, d := range l.Instance.AdditionalDisks {
+			diskName := d.Name
+			disk, err := store.InspectDisk(diskName)
+			if err != nil {
+				logrus.Errorf("could not load disk %q: %q", diskName, err)
+				return err
+			}
+
+			if disk.Instance != "" {
+				logrus.Errorf("could not attach disk %q, in use by instance %q", diskName, disk.Instance)
+				return err
+			}
+			logrus.Infof("Mounting disk %q on %q", diskName, disk.MountPoint)
+			err = disk.Lock(l.Instance.Dir)
+			if err != nil {
+				logrus.Errorf("could not lock disk %q: %q", diskName, err)
+				return err
+			}
+			dataDisk := filepath.Join(disk.Dir, filenames.DataDisk)
+			extraDisks = append(extraDisks, dataDisk)
+		}
+	}
 	isBaseDiskISO, err := iso9660util.IsISO9660(baseDisk)
 	if err != nil {
 		return err
@@ -128,6 +153,17 @@ func (l *LimaVBoxDriver) create(ctx context.Context, name string) error {
 		logrus.Debugf("diffdisk %v", err)
 		return err
 	}
+	for i, extraDisk := range extraDisks {
+		if err := exec.CommandContext(ctx, qExe, "storageattach", name,
+			"--storagectl", "SATA",
+			"--port", "3",
+			"--device", fmt.Sprintf("%d", i),
+			"--type", "hdd",
+			"--medium", extraDisk).Run(); err != nil {
+			logrus.Debugf("extradisk %v", err)
+			return err
+		}
+	}
 
 	if err := exec.CommandContext(ctx, qExe, "storageattach", name,
 		"--storagectl", "SATA",