Add vmdk diskman; first successful Fusion boot

Author: zeeyang

vmware/machine.go

@@ -4,21 +4,20 @@ import (
 	"fmt"
 	"os"
 	"path/filepath"
-	"strings"
 	"text/template"
 
 	"github.com/boot2docker/boot2docker-cli/driver"
 	"github.com/ogier/pflag"
 )
 
 var (
-	verbose bool // Verbose mode (Local copy of B2D.Verbose).
+	verbose bool // Verbose mode.
 	cfg     DriverCfg
 )
 
 type DriverCfg struct {
-	VMRUN string // Path to VBoxManage utility.
-	VMDK  string // base VMDK to use as persistent disk.
+	VMRUN    string // Path to vmrun utility.
+	VDISKMAN string // Path to vdiskmanager utility.
 }
 
 func init() {
@@ -46,7 +45,10 @@ func InitFunc(mc *driver.MachineConfig) (driver.Machine, error) {
 // Add cmdline params for this driver
 func ConfigFlags(mc *driver.MachineConfig, flags *pflag.FlagSet) error {
 	cfg.VMRUN = "/Applications/VMware Fusion.app/Contents/Library/vmrun"
-	flags.StringVar(&cfg.VMRUN, "vmrun", cfg.VMRUN, "path to vmrun management utility.")
+	flags.StringVar(&cfg.VMRUN, "vmrun", cfg.VMRUN, "path to vmrun utility.")
+
+	cfg.VDISKMAN = "/Applications/VMware Fusion.app/Contents/Library/vmware-vdiskmanager"
+	flags.StringVar(&cfg.VDISKMAN, "vmdiskman", cfg.VDISKMAN, "path to vdiskmanager utility.")
 
 	return nil
 }
@@ -67,7 +69,7 @@ type Machine struct {
 
 // Refresh reloads the machine information.
 func (m *Machine) Refresh() error {
-	mm, err := GetMachine(m.Name)
+	mm, err := GetMachine(m.VMX)
 	mm.State = driver.Running
 	if err != nil {
 		return err
@@ -217,18 +219,32 @@ func CreateMachine(mc *driver.MachineConfig) (*Machine, error) {
 		return nil, ErrMachineExist
 	}
 
+	// Generate vmx config file from template
 	vmxt := template.Must(template.New("vmx").Parse(vmx))
 	vmxfile, err := os.Create(getVMX(mc))
 	if err != nil {
 		return nil, err
 	}
 	vmxt.Execute(vmxfile, mc)
+
+	// Generate vmdk file
+	diskImg := filepath.Join(getBaseFolder(mc), fmt.Sprintf("%s.vmdk", mc.VM))
+	if _, err := os.Stat(diskImg); err != nil {
+		if !os.IsNotExist(err) {
+			return nil, err
+		}
+
+		if err := vdiskmanager(diskImg, mc.DiskSize); err != nil {
+			return nil, err
+		}
+	}
+
 	return nil, nil
 }
 
 func getBaseFolder(mc *driver.MachineConfig) string {
 	return filepath.Join(mc.Dir, mc.VM)
 }
 func getVMX(mc *driver.MachineConfig) string {
-	return filepath.Join(getBaseFolder(mc), strings.Join([]string{mc.VM, "vmx"}, "."))
+	return filepath.Join(getBaseFolder(mc), fmt.Sprintf("%s.vmx", mc.VM))
 }

vmware/vmrun.go

@@ -2,6 +2,7 @@ package vmware
 
 import (
 	"errors"
+	"fmt"
 	"log"
 	"os"
 	"os/exec"
@@ -28,3 +29,15 @@ func vmrun(args ...string) error {
 	}
 	return nil
 }
+
+// Make a vmdk disk image with the given size (in MB).
+func vdiskmanager(dest string, size uint) error {
+	cmd := exec.Command(cfg.VDISKMAN, "-c", "-t", "0", "-s", fmt.Sprintf("%dMB", size), "-a", "lsilogic", dest)
+
+	if stdout := cmd.Run(); stdout != nil {
+		if ee, ok := stdout.(*exec.Error); ok && ee == exec.ErrNotFound {
+			return ErrVMRUNNotFound
+		}
+	}
+	return nil
+}

vmware/vmx.go

@@ -2,42 +2,30 @@ package vmware
 
 const vmx = `
 .encoding = "UTF-8"
-bios.bootOrder = "CDROM"
 config.version = "8"
 displayName = "{{.VM}}"
-ethernet0.addressType = "static"
+ethernet0.addressType = "generated"
 ethernet0.connectionType = "nat"
-ethernet0.address = "00:0c:29:2c:fe:e5"
-ethernet0.linkStatePropagation.enable = "FALSE"
-ethernet0.pciSlotNumber = "33"
+ethernet0.linkStatePropagation.enable = "TRUE"
 ethernet0.present = "TRUE"
 ethernet0.virtualDev = "e1000"
 ethernet0.wakeOnPcktRcv = "FALSE"
-ethernet1.addressType = "static"
-ethernet1.connectionType = "hostonly"
-ethernet1.address = "00:0c:29:2c:fe:ef"
-ethernet1.pciSlotNumber = "34"
-ethernet1.present = "TRUE"
-ethernet1.virtualDev = "e1000"
-ethernet1.wakeOnPcktRcv = "FALSE"
 floppy0.present = "FALSE"
 guestOS = "other26xlinux-64"
 hpet0.present = "TRUE"
 ide1:0.deviceType = "cdrom-image"
 ide1:0.fileName = "{{.ISO}}"
 ide1:0.present = "TRUE"
 mem.hotadd = "TRUE"
-memsize = "1024"
+memsize = "{{.Memory}}"
 powerType.powerOff = "soft"
 powerType.powerOn = "soft"
 powerType.reset = "soft"
 powerType.suspend = "soft"
-sata0.present = "TRUE"
-sata0:0.fileName = "{{.VMDK}}"
-sata0:0.present = "TRUE"
-scsi0.pciSlotNumber = "16"
-scsi0.present = "FALSE"
+scsi0.present = "TRUE"
 scsi0.virtualDev = "lsilogic"
-scsi0:0.present = "FALSE"
+scsi0:0.fileName = "{{.VM}}.vmdk"
+scsi0:0.present = "TRUE"
+virtualHW.productCompatibility = "hosted"
 virtualHW.version = "10"
 `