haskal
/
vagrant
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Preserve Disk Image Name 

detect and preserve the original name of the disk image rather than forcing it to be disk
This commit is contained in:
Kevin Blair 2016-02-16 14:57:53 +00:00
parent 43e90666e1
commit 343a43cae6
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/providers/hyperv/action/import.rb
View File

@ -38,10 +38,12 @@ module VagrantPlugins
image_path = nil image_path = nil
image_ext = nil image_ext = nil
image_filename = nil
hd_dir.each_child do |f| hd_dir.each_child do |f|
if %w{.vhd .vhdx}.include?(f.extname.downcase) if %w{.vhd .vhdx}.include?(f.extname.downcase)
image_path = f image_path = f
image_ext = f.extname.downcase image_ext = f.extname.downcase
image_filename = File.basename(f,image_ext)
break break
end end
end end
@ -92,7 +94,7 @@ module VagrantPlugins
env[:ui].detail("Cloning virtual hard drive...") env[:ui].detail("Cloning virtual hard drive...")
source_path = image_path.to_s source_path = image_path.to_s
dest_path = env[:machine].data_dir.join("disk#{image_ext}").to_s dest_path = env[:machine].data_dir.join("#{image_filename}#{image_ext}").to_s
FileUtils.cp(source_path, dest_path) FileUtils.cp(source_path, dest_path)
image_path = dest_path image_path = dest_path
@ -103,10 +105,10 @@ module VagrantPlugins
image_path: image_path.to_s.gsub("/", "\\") image_path: image_path.to_s.gsub("/", "\\")
} }
options[:switchname] = switch if switch options[:switchname] = switch if switch
options[:memory] = memory if memory options[:memory] = memory if memory
options[:maxmemory] = maxmemory if maxmemory options[:maxmemory] = maxmemory if maxmemory
options[:cpus] = cpus if cpus options[:cpus] = cpus if cpus
options[:vmname] = vmname if vmname options[:vmname] = vmname if vmname
env[:ui].detail("Creating and registering the VM...") env[:ui].detail("Creating and registering the VM...")
server = env[:machine].provider.driver.import(options) server = env[:machine].provider.driver.import(options)