From 8b358309f243535174d1861d8e83209e18c05c18 Mon Sep 17 00:00:00 2001 From: Gursharan Singh Date: Thu, 7 Feb 2019 21:50:49 +1100 Subject: [PATCH] replace vmxc with vmcx to comply with packer hyperv-vmcx builder --- src/core/cake/template.cake | 2 +- src/u/packer/builders/hyperv-vmcx/template.json | 4 ++-- src/w/packer/builders/hyperv-vmcx/template.json | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/core/cake/template.cake b/src/core/cake/template.cake index 49feb34de..ea2068f8e 100644 --- a/src/core/cake/template.cake +++ b/src/core/cake/template.cake @@ -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; } } } diff --git a/src/u/packer/builders/hyperv-vmcx/template.json b/src/u/packer/builders/hyperv-vmcx/template.json index 692e92cad..ca46d01be 100644 --- a/src/u/packer/builders/hyperv-vmcx/template.json +++ b/src/u/packer/builders/hyperv-vmcx/template.json @@ -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`}}", diff --git a/src/w/packer/builders/hyperv-vmcx/template.json b/src/w/packer/builders/hyperv-vmcx/template.json index a6a6f1cef..5bc27db86 100644 --- a/src/w/packer/builders/hyperv-vmcx/template.json +++ b/src/w/packer/builders/hyperv-vmcx/template.json @@ -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`}}",