Skip to content

Commit

Permalink
Merge pull request #115 from gursharan001/vmcx-variable-typo
Browse files Browse the repository at this point in the history
replace vmxc with vmcx to comply with packer hyperv-vmcx builder
  • Loading branch information
gusztavvargadr committed Feb 10, 2019
2 parents c70aff7 + 8b35830 commit 22a4658
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/core/cake/template.cake
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ void PackerTemplate_MergeJson(PackerTemplate template) {
}
if (template.Builders.Any(item => item.IsMatching("hyperv"))) {
var parentBuildOutputDirectory = parentBuildDirectory + "/output";
jsonTemplateVariables["hyperv_clone_from_vmxc_path"] = parentBuildOutputDirectory;
jsonTemplateVariables["hyperv_clone_from_vmcx_path"] = parentBuildOutputDirectory;
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/u/packer/builders/hyperv-vmcx/template.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"variables": {
"hyperv_clone_from_vmxc_path": "",
"hyperv_clone_from_vmcx_path": "",
},
"builders": [
{
"type": "hyperv-vmcx",
"vm_name": "{{user `author`}}-{{user `name`}}-{{user `version`}}-{{timestamp}}",
"clone_from_vmxc_path": "{{user `hyperv_clone_from_vmxc_path`}}",
"clone_from_vmcx_path": "{{user `hyperv_clone_from_vmcx_path`}}",
"ram_size": "{{user `hyperv_ram_size`}}",
"enable_dynamic_memory": "{{user `hyperv_enable_dynamic_memory`}}",
"cpu": "{{user `hyperv_cpu`}}",
Expand Down
4 changes: 2 additions & 2 deletions src/w/packer/builders/hyperv-vmcx/template.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"variables": {
"hyperv_clone_from_vmxc_path": ""
"hyperv_clone_from_vmcx_path": ""
},
"builders": [
{
"type": "hyperv-vmcx",
"vm_name": "{{user `author`}}-{{user `name`}}-{{user `version`}}-{{timestamp}}",
"clone_from_vmxc_path": "{{user `hyperv_clone_from_vmxc_path`}}",
"clone_from_vmcx_path": "{{user `hyperv_clone_from_vmcx_path`}}",
"ram_size": "{{user `hyperv_ram_size`}}",
"enable_dynamic_memory": "{{user `hyperv_enable_dynamic_memory`}}",
"cpu": "{{user `hyperv_cpu`}}",
Expand Down

0 comments on commit 22a4658

Please sign in to comment.