Merge pull request #222 from SvenDowideit/fix-windows-vbox-path

Fix windows vbox path, and dockerport forward off by default.

Author: Sven Dowideit

cmds.go

@@ -101,10 +101,10 @@ func cmdUp() error {
 func cmdConfig() error {
 	dir, err := cfgDir(".boot2docker")
 	if err != nil {
-		return fmt.Errorf("Error working out Profile file location: %s", err)
+		return fmt.Errorf("Error working out Profile file location: %s\n", err)
 	}
 	filename := cfgFilename(dir)
-	fmt.Printf("boot2docker profile filename: %s", filename)
+	fmt.Printf("boot2docker profile filename: %s\n", filename)
 	fmt.Println(printConfig())
 	return nil
 }
@@ -113,10 +113,10 @@ func cmdConfig() error {
 func cmdSave() error {
 	m, err := driver.GetMachine(&B2D)
 	if err != nil {
-		return fmt.Errorf("Failed to get machine %q: %s", B2D.VM, err)
+		return fmt.Errorf("Failed to get machine %q: %s\n", B2D.VM, err)
 	}
 	if err := m.Save(); err != nil {
-		return fmt.Errorf("Failed to save machine %q: %s", B2D.VM, err)
+		return fmt.Errorf("Failed to save machine %q: %s\n", B2D.VM, err)
 	}
 	return nil
 }

config.go

@@ -83,26 +83,45 @@ func config() (*flag.FlagSet, error) {
 	flags := flag.NewFlagSet(os.Args[0], flag.ContinueOnError)
 	flags.Usage = func() { usageLong(flags) }
 
+	// Find out which driver we're usng and add its flags
+	flags.StringVar(&B2D.Driver, "driver", "virtualbox", "hypervisor driver.")
+	flags.BoolVarP(&B2D.Verbose, "verbose", "v", false, "display verbose command invocations.")
+
+	if err := flags.Parse([]string{}); err != nil {
+		return nil, err
+	}
+	// Over-ride from the profile file
+	filename := cfgFilename(B2D.Dir)
+	if _, err := os.Lstat(filename); err == nil {
+		if _, err := toml.DecodeFile(filename, &B2D); err != nil {
+			return nil, err
+		}
+	}
+	// for cmd==ssh only:
+	// only pass the params up to and including the `ssh` command - after that,
+	// there might be other -flags that are destined for the ssh cmd
+	sshIdx := 1
+	for sshIdx < len(os.Args) && os.Args[sshIdx-1] != "ssh" {
+		sshIdx++
+	}
+	// Command-line overrides profile config.
+	if err := flags.Parse(os.Args[1:sshIdx]); err != nil {
+		return nil, err
+	}
+	if B2D.Verbose {
+		fmt.Printf("Using %s driver\n", B2D.Driver)
+	}
+	driver.ConfigFlags(&B2D, flags)
+
+	// Add the generic flags
+
 	flags.StringVar(&B2D.VM, "vm", "boot2docker-vm", "virtual machine name.")
 	// removed for now, requires re-parsing a new config file which is too messy
 	//flags.StringVarP(&B2D.Dir, "dir", "d", dir, "boot2docker config directory.")
 	B2D.Dir = dir
 	flags.StringVar(&B2D.ISO, "iso", filepath.Join(dir, "boot2docker.iso"), "path to boot2docker ISO image.")
-	flags.StringVar(&B2D.VMDK, "basevmdk", "", "Path to VMDK to use as base for persistent partition")
-	vbm := "VBoxManage"
-	if runtime.GOOS == "windows" {
-		p := "C:\\Program Files\\Oracle\\VirtualBox"
-		if t := os.Getenv("VBOX_INSTALL_PATH"); t != "" {
-			p = t
-		} else if t = os.Getenv("VBOX_MSI_INSTALL_PATH"); t != "" {
-			p = t
-		}
-		vbm = filepath.Join(p, "VBoxManage.exe")
-	}
+
 	flags.BoolVarP(&B2D.Init, "init", "i", false, "auto initialize vm instance.")
-	flags.StringVar(&B2D.VBM, "vbm", vbm, "path to VirtualBox management utility.")
-	flags.BoolVarP(&B2D.Verbose, "verbose", "v", false, "display verbose command invocations.")
-	flags.StringVar(&B2D.Driver, "driver", "virtualbox", "hypervisor driver.")
 	flags.StringVar(&B2D.SSH, "ssh", "ssh", "path to SSH client utility.")
 	flags.StringVar(&B2D.SSHGen, "ssh-keygen", "ssh-keygen", "path to ssh-keygen utility.")
 
@@ -132,22 +151,14 @@ func config() (*flag.FlagSet, error) {
 		return nil, err
 	}
 	// Over-ride from the profile file
-	filename := cfgFilename(B2D.Dir)
 	if _, err := os.Lstat(filename); err == nil {
 		if _, err := toml.DecodeFile(filename, &B2D); err != nil {
 			return nil, err
 		}
 	}
 
-	// for cmd==ssh only:
-	// only pass the params up to and including the `ssh` command - after that,
-	// there might be other -flags that are destined for the ssh cmd
-	i := 1
-	for i < len(os.Args) && os.Args[i-1] != "ssh" {
-		i++
-	}
 	// Command-line overrides profile config.
-	if err := flags.Parse(os.Args[1:i]); err != nil {
+	if err := flags.Parse(os.Args[1:sshIdx]); err != nil {
 		return nil, err
 	}
 

driver/config.go

@@ -1,13 +1,16 @@
 package driver
 
-import "net"
+import (
+	"fmt"
+	flag "github.com/ogier/pflag"
+	"net"
+)
 
 // Machine config.
 type MachineConfig struct {
 	// Gereral flags.
 	Init    bool
 	Verbose bool
-	VBM     string
 	Driver  string
 
 	// basic config
@@ -17,7 +20,6 @@ type MachineConfig struct {
 	VM       string // virtual machine name
 	Dir      string // boot2docker directory
 	ISO      string // boot2docker ISO image path
-	VMDK     string // base VMDK to use as persistent disk
 	DiskSize uint   // VM disk image size (MB)
 	Memory   uint   // VM memory size (MB)
 
@@ -37,3 +39,28 @@ type MachineConfig struct {
 	Serial     bool
 	SerialFile string
 }
+
+type ConfigFunc func(B2D *MachineConfig, flags *flag.FlagSet) error
+
+var configs map[string]ConfigFunc // optional map of driver ConfigFunc
+
+func init() {
+	configs = make(map[string]ConfigFunc)
+}
+
+// optional - allows a driver to add its own commandline parameters
+func RegisterConfig(driver string, configFunc ConfigFunc) error {
+	if _, exists := configs[driver]; exists {
+		return fmt.Errorf("Driver already registered %s", driver)
+	}
+	configs[driver] = configFunc
+
+	return nil
+}
+
+func ConfigFlags(B2D *MachineConfig, flags *flag.FlagSet) error {
+	if configFunc, exists := configs[B2D.Driver]; exists {
+		return configFunc(B2D, flags)
+	}
+	return nil
+}

virtualbox/disk.go

@@ -15,7 +15,7 @@ func MakeDiskImage(dest string, size uint, r io.Reader) error {
 	cmd := exec.Command(VBM, "convertfromraw", "stdin", dest,
 		fmt.Sprintf("%d", sizeBytes), "--format", "VMDK")
 
-	if Verbose {
+	if verbose {
 		cmd.Stdout = os.Stdout
 		cmd.Stderr = os.Stderr
 	}

virtualbox/machine.go

@@ -15,6 +15,7 @@ import (
 	"time"
 
 	"github.com/boot2docker/boot2docker-cli/driver"
+	flag "github.com/ogier/pflag"
 )
 
 type Flag int
@@ -38,22 +39,51 @@ const (
 	F_accelerate3d
 )
 
+var (
+	VBM     string // Path to VBoxManage utility.
+	VMDK    string // base VMDK to use as persistent disk.
+	verbose bool   // Verbose mode (Local copy of B2D.Verbose).
+)
+
 func init() {
 	if err := driver.Register("virtualbox", InitFunc); err != nil {
 		fmt.Fprintf(os.Stderr, "Failed to initialize driver. Error : %s", err.Error())
 		os.Exit(1)
 	}
+	if err := driver.RegisterConfig("virtualbox", ConfigFlags); err != nil {
+		fmt.Fprintf(os.Stderr, "Failed to initialize driver config. Error : %s", err.Error())
+		os.Exit(1)
+	}
 }
 
 // Initialize the Machine.
 func InitFunc(mc *driver.MachineConfig) (driver.Machine, error) {
+	verbose = mc.Verbose
+
 	m, err := GetMachine(mc.VM)
 	if err != nil && mc.Init {
 		return CreateMachine(mc)
 	}
 	return m, err
 }
 
+func ConfigFlags(B2D *driver.MachineConfig, flags *flag.FlagSet) error {
+	flags.StringVar(&VMDK, "basevmdk", "", "Path to VMDK to use as base for persistent partition")
+	vbm := "VBoxManage"
+	if runtime.GOOS == "windows" {
+		p := "C:\\Program Files\\Oracle\\VirtualBox"
+		if t := os.Getenv("VBOX_INSTALL_PATH"); t != "" {
+			p = t
+		} else if t = os.Getenv("VBOX_MSI_INSTALL_PATH"); t != "" {
+			p = t
+		}
+		vbm = filepath.Join(p, "VBoxManage.exe")
+	}
+	flags.StringVar(&VBM, "vbm", vbm, "path to VirtualBox management utility.")
+
+	return nil
+}
+
 // Convert bool to "on"/"off"
 func bool2string(b bool) string {
 	if b {
@@ -387,7 +417,7 @@ func CreateMachine(mc *driver.MachineConfig) (*Machine, error) {
 	// Set NIC #1 to use NAT
 	m.SetNIC(1, driver.NIC{Network: driver.NICNetNAT, Hardware: driver.VirtIO})
 	pfRules := map[string]driver.PFRule{
-		"ssh":    {Proto: driver.PFTCP, HostIP: net.ParseIP("127.0.0.1"), HostPort: mc.SSHPort, GuestPort: driver.SSHPort},
+		"ssh": {Proto: driver.PFTCP, HostIP: net.ParseIP("127.0.0.1"), HostPort: mc.SSHPort, GuestPort: driver.SSHPort},
 	}
 	if mc.DockerPort > 0 {
 		pfRules["docker"] = driver.PFRule{Proto: driver.PFTCP, HostIP: net.ParseIP("127.0.0.1"), HostPort: mc.DockerPort, GuestPort: driver.DockerPort}
@@ -425,8 +455,8 @@ func CreateMachine(mc *driver.MachineConfig) (*Machine, error) {
 			return m, err
 		}
 
-		if mc.VMDK != "" {
-			if err := copyDiskImage(diskImg, mc.VMDK); err != nil {
+		if VMDK != "" {
+			if err := copyDiskImage(diskImg, VMDK); err != nil {
 				return m, err
 			}
 		} else {

virtualbox/vbm.go

@@ -9,22 +9,12 @@ import (
 	"os/exec"
 	"path/filepath"
 	"regexp"
-	"runtime"
 	"strings"
 
 	"github.com/boot2docker/boot2docker-cli/driver"
 )
 
-var (
-	VBM     string // Path to VBoxManage utility.
-	Verbose bool   // Verbose mode.
-)
-
 func init() {
-	VBM = "VBoxManage"
-	if p := os.Getenv("VBOX_INSTALL_PATH"); p != "" && runtime.GOOS == "windows" {
-		VBM = filepath.Join(p, "VBoxManage.exe")
-	}
 }
 
 var (
@@ -42,7 +32,7 @@ var (
 
 func vbm(args ...string) error {
 	cmd := exec.Command(VBM, args...)
-	if Verbose {
+	if verbose {
 		cmd.Stdout = os.Stdout
 		cmd.Stderr = os.Stderr
 		log.Printf("executing: %v %v", VBM, strings.Join(args, " "))
@@ -58,7 +48,7 @@ func vbm(args ...string) error {
 
 func vbmOut(args ...string) (string, error) {
 	cmd := exec.Command(VBM, args...)
-	if Verbose {
+	if verbose {
 		cmd.Stderr = os.Stderr
 		log.Printf("executing: %v %v", VBM, strings.Join(args, " "))
 	}
@@ -74,7 +64,7 @@ func vbmOut(args ...string) (string, error) {
 
 func vbmOutErr(args ...string) (string, string, error) {
 	cmd := exec.Command(VBM, args...)
-	if Verbose {
+	if verbose {
 		log.Printf("executing: %v %v", VBM, strings.Join(args, " "))
 	}
 	var stdout bytes.Buffer

virtualbox/vbm_test.go

@@ -5,7 +5,7 @@ import (
 )
 
 func init() {
-	Verbose = true
+	verbose = true
 }
 
 func TestVBMOut(t *testing.T) {