From 2fc93277fd5a22257cbe70032b2d06a14ccdd49f Mon Sep 17 00:00:00 2001 From: Bjorn Brala Date: Sun, 2 Oct 2016 18:45:51 +0200 Subject: [PATCH] change argument to vm_config_file so it isn't the same as variable in powershell script. --- plugins/providers/hyperv/action/import.rb | 2 +- plugins/providers/hyperv/scripts/import_vm_vmcx.ps1 | 2 +- plugins/providers/hyperv/scripts/import_vm_xml.ps1 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/providers/hyperv/action/import.rb b/plugins/providers/hyperv/action/import.rb index 97351e12a..abc6d02c5 100644 --- a/plugins/providers/hyperv/action/import.rb +++ b/plugins/providers/hyperv/action/import.rb @@ -119,7 +119,7 @@ module VagrantPlugins # We have to normalize the paths to be Windows paths since # we're executing PowerShell. options = { - vm_config: config_path.to_s.gsub("/", "\\"), + vm_config_file: config_path.to_s.gsub("/", "\\"), vm_config_type: config_type, image_path: image_path.to_s.gsub("/", "\\") } diff --git a/plugins/providers/hyperv/scripts/import_vm_vmcx.ps1 b/plugins/providers/hyperv/scripts/import_vm_vmcx.ps1 index 33c961e33..36f7eae69 100644 --- a/plugins/providers/hyperv/scripts/import_vm_vmcx.ps1 +++ b/plugins/providers/hyperv/scripts/import_vm_vmcx.ps1 @@ -1,6 +1,6 @@ Param( [Parameter(Mandatory=$true)] - [string]$vm_config, + [string]$vm_config_file, [Parameter(Mandatory=$true)] [string]$image_path, diff --git a/plugins/providers/hyperv/scripts/import_vm_xml.ps1 b/plugins/providers/hyperv/scripts/import_vm_xml.ps1 index 18d99d203..89383c254 100644 --- a/plugins/providers/hyperv/scripts/import_vm_xml.ps1 +++ b/plugins/providers/hyperv/scripts/import_vm_xml.ps1 @@ -1,6 +1,6 @@ Param( [Parameter(Mandatory=$true)] - [string]$vm_config, + [string]$vm_config_file, [Parameter(Mandatory=$true)] [string]$image_path,