Skip to content
This repository was archived by the owner on Feb 27, 2018. It is now read-only.

Adds config option to specify a base disk image for persistence partition #79

Merged
riobard merged 5 commits into from
Apr 9, 2014
Merged

Adds config option to specify a base disk image for persistence partition #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
237b9dd
Adds basevmdk config directive
Apr 1, 2014
980b5ab
updates cmdInit() to check for B2D.VMDK
Apr 1, 2014
781cb9d
Adds helper to copy a specified disk image for the persistent partition
Apr 1, 2014
96eeb1b
Updates in-line deferred function to not return
Apr 1, 2014
f28bedb
Adds named return value to copyDiskImage()
Apr 2, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions cmds.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,18 @@ func cmdInit() int {
return 1
}

if err := makeDiskImage(diskImg, B2D.DiskSize); err != nil {
logf("Failed to create disk image %q: %s", diskImg, err)
return 1
}
if B2D.VMDK != "" {
logf("Using %v as base VMDK", B2D.VMDK)
if err := copyDiskImage(diskImg, B2D.VMDK); err != nil {
logf("Failed to copy disk image %v from %v: %s", diskImg, B2D.VMDK, err)
return 1
}
} else {
if err := makeDiskImage(diskImg, B2D.DiskSize); err != nil {
logf("Failed to create disk image %q: %s", diskImg, err)
return 1
}
}

@tianon tianon Apr 9, 2014

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs gofmt (because those are clearly spaces, not tabs).

}

if err := m.AttachStorage("SATA", vbx.StorageMedium{Port: 1, Device: 0, DriveType: vbx.DriveHDD, Medium: diskImg}); err != nil {
Expand Down
2 changes: 2 additions & 0 deletions config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ var B2D 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)

Expand Down Expand Up @@ -106,6 +107,7 @@ func config() (*flag.FlagSet, error) {
flags.StringVar(&B2D.VM, "vm", "boot2docker-vm", "virtual machine name.")
flags.StringVarP(&B2D.Dir, "dir", "d", dir, "boot2docker config directory.")
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 p := os.Getenv("VBOX_INSTALL_PATH"); p != "" && runtime.GOOS == "windows" {
vbm = filepath.Join(p, "VBoxManage.exe")
Expand Down
28 changes: 28 additions & 0 deletions vbm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package main

import (
"bytes"
"io"
"os"
"path/filepath"

Expand Down Expand Up @@ -66,6 +67,33 @@ func getHostOnlyNetworkInterface() (string, error) {
return hostonlyNet.Name, nil
}

// Copy disk image from given source path to destination
func copyDiskImage(dst, src string) (err error) {
// Open source disk image
srcImg, err := os.Open(src)
if err != nil {
return err
}
closeSrcImg := func() {
if ee := srcImg.Close(); ee != nil {
err = ee
}
}
defer closeSrcImg()
dstImg, err := os.Create(dst)
if err != nil {
return err
}
closeDstImg := func() {
if ee := dstImg.Close(); ee != nil {
err = ee
}
}
defer closeDstImg()
_, err = io.Copy(dstImg, srcImg)
return err
}

// Make a boot2docker VM disk image with the given size (in MB).
func makeDiskImage(dest string, size uint) error {
// Create the dest dir.
Expand Down