Commit 15f191de authored by Mitchell Hashimoto's avatar Mitchell Hashimoto

builder/virtualbox: Copy ISO because VirtualBox can't recognize

parent d52cd1ed
...@@ -7,7 +7,11 @@ import ( ...@@ -7,7 +7,11 @@ import (
"github.com/mitchellh/multistep" "github.com/mitchellh/multistep"
"github.com/mitchellh/packer/builder/common" "github.com/mitchellh/packer/builder/common"
"github.com/mitchellh/packer/packer" "github.com/mitchellh/packer/packer"
"io"
"io/ioutil"
"log" "log"
"os"
"path/filepath"
"time" "time"
) )
...@@ -20,9 +24,11 @@ import ( ...@@ -20,9 +24,11 @@ import (
// //
// Produces: // Produces:
// iso_path string // iso_path string
type stepDownloadISO struct{} type stepDownloadISO struct {
isoCopyDir string
}
func (s stepDownloadISO) Run(state map[string]interface{}) multistep.StepAction { func (s *stepDownloadISO) Run(state map[string]interface{}) multistep.StepAction {
cache := state["cache"].(packer.Cache) cache := state["cache"].(packer.Cache)
config := state["config"].(*config) config := state["config"].(*config)
ui := state["ui"].(packer.Ui) ui := state["ui"].(packer.Ui)
...@@ -81,10 +87,42 @@ DownloadWaitLoop: ...@@ -81,10 +87,42 @@ DownloadWaitLoop:
} }
} }
// VirtualBox is really dumb and can't figure out that the file is an
// ISO unless it has a ".iso" extension. We can't modify the cache
// filenames so we just do a copy.
tempdir, err := ioutil.TempDir("", "packer")
if err != nil {
state["error"] = fmt.Errorf("Error copying ISO: %s", err)
return multistep.ActionHalt
}
s.isoCopyDir = tempdir
f, err := os.Create(filepath.Join(tempdir, "image.iso"))
if err != nil {
state["error"] = fmt.Errorf("Error copying ISO: %s", err)
return multistep.ActionHalt
}
defer f.Close()
sourceF, err := os.Open(cachePath)
if err != nil {
state["error"] = fmt.Errorf("Error copying ISO: %s", err)
return multistep.ActionHalt
}
if _, err := io.Copy(f, sourceF); err != nil {
state["error"] = fmt.Errorf("Error copying ISO: %s", err)
return multistep.ActionHalt
}
log.Printf("Path to ISO on disk: %s", cachePath) log.Printf("Path to ISO on disk: %s", cachePath)
state["iso_path"] = cachePath state["iso_path"] = f.Name()
return multistep.ActionContinue return multistep.ActionContinue
} }
func (stepDownloadISO) Cleanup(map[string]interface{}) {} func (s *stepDownloadISO) Cleanup(map[string]interface{}) {
if s.isoCopyDir != "" {
os.RemoveAll(s.isoCopyDir)
}
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment