iSharkFly-Docs/packer-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

builder/virtualbox,vmware: support user templates in SSH key path

Browse Source 
[GH-539]
This commit is contained in:
Mitchell Hashimoto 2013-10-20 15:58:39 -07:00
parent a54e5e70da
commit 65169b4576
3 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -20,6 +20,8 @@ BUG FIXES:
* builder/virtualbox: sleep a bit before export to ensure the sesssion * builder/virtualbox: sleep a bit before export to ensure the sesssion
is unlocked. [GH-512] is unlocked. [GH-512]
* builder/virtualbox: create SATA drives properly on VirtualBox 4.3 [GH-547] * builder/virtualbox: create SATA drives properly on VirtualBox 4.3 [GH-547]
* builder/virtualbox: support user templates in SSH key path. [GH-539]
* builder/vmware: support user templates in SSH key path. [GH-539]
* communicator/ssh: Fix issue where a panic could arise from a nil * communicator/ssh: Fix issue where a panic could arise from a nil
dereference. [GH-525] dereference. [GH-525]
* post-processor/vagrant: Fix issue with VirtualBox OVA. [GH-548] * post-processor/vagrant: Fix issue with VirtualBox OVA. [GH-548]

1
builder/virtualbox/builder.go
View File

@ -154,6 +154,7 @@ func (b *Builder) Prepare(raws ...interface{}) error {
"iso_url": &b.config.RawSingleISOUrl, "iso_url": &b.config.RawSingleISOUrl,
"output_directory": &b.config.OutputDir, "output_directory": &b.config.OutputDir,
"shutdown_command": &b.config.ShutdownCommand, "shutdown_command": &b.config.ShutdownCommand,
"ssh_key_path": &b.config.SSHKeyPath,
"ssh_password": &b.config.SSHPassword, "ssh_password": &b.config.SSHPassword,
"ssh_username": &b.config.SSHUser, "ssh_username": &b.config.SSHUser,
"virtualbox_version_file": &b.config.VBoxVersionFile, "virtualbox_version_file": &b.config.VBoxVersionFile,

1
builder/vmware/builder.go
View File

@ -148,6 +148,7 @@ func (b *Builder) Prepare(raws ...interface{}) error {
"iso_url": &b.config.RawSingleISOUrl, "iso_url": &b.config.RawSingleISOUrl,
"output_directory": &b.config.OutputDir, "output_directory": &b.config.OutputDir,
"shutdown_command": &b.config.ShutdownCommand, "shutdown_command": &b.config.ShutdownCommand,
"ssh_key_path": &b.config.SSHKeyPath,
"ssh_password": &b.config.SSHPassword, "ssh_password": &b.config.SSHPassword,
"ssh_username": &b.config.SSHUser, "ssh_username": &b.config.SSHUser,
"tools_upload_flavor": &b.config.ToolsUploadFlavor, "tools_upload_flavor": &b.config.ToolsUploadFlavor,