lib/veewee/provider/vmfusion/box/template.rb in veewee-0.3.1 vs lib/veewee/provider/vmfusion/box/template.rb in veewee-0.3.2
- old
+ new
@@ -15,28 +15,32 @@
floppy_path=nil
unless definition.floppy_files.nil?
floppy_path=File.join(definition.path,'virtualfloppy.img')
end
-
+
# Depending on the fusion version, we need to update the virtualhw version
if @provider.fusion_version.start_with?('5.')
virtualhw_version = 9
else
virtualhw_version = 7
end
-
+
+ puts definition.vmdk_file
+ vmdk_file = File.basename(definition.vmdk_file) unless definition.vmdk_file.nil?
# Setup the variables for in the erb template
data = {
:cpu_count => definition.cpu_count, :memory_size => definition.memory_size,
:controller_type => "lsilogic",
:fusion_os_type => definition.os_type_id,
:virtualhw_version => virtualhw_version,
:floppyfile => floppy_path,
:mac_addres => "auto generated",
:iso_file => "#{File.join(env.config.veewee.iso_dir,definition.iso_file)}",
:box_name => name,
- :vnc_port => guess_vnc_port
+ :vnc_port => guess_vnc_port,
+ :fusion_version => @provider.fusion_version,
+ :vmdk_file => vmdk_file
}
vars = ErbBinding.new(data)
template_path=File.join(File.dirname(__FILE__),"template.vmx.erb")
template=File.open(template_path).readlines.join