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

Removed traces of ovf_file usage in actions

This commit is contained in:
Mitchell Hashimoto 2010-02-22 23:15:21 -08:00
parent 10e67e85f0
commit bd551174ba
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/vagrant/actions/vm/import.rb
View File

@ -2,19 +2,12 @@ module Vagrant
module Actions module Actions
module VM module VM
class Import < Base class Import < Base
attr_accessor :ovf_file
#First arg should be the ovf_file location for import
def initialize(vm, *args)
super vm
@ovf_file = File.expand_path(args[0] || Vagrant.config[:vm][:base])
end
def execute! def execute!
@runner.invoke_around_callback(:import) do @runner.invoke_around_callback(:import) do
Busy.busy do Busy.busy do
logger.info "Importing base VM (#{@ovf_file})..." logger.info "Importing base VM (#{Vagrant.config[:vm][:base]})..."
# Use the first argument passed to the action # Use the first argument passed to the action
@runner.vm = VirtualBox::VM.import(@ovf_file) @runner.vm = VirtualBox::VM.import(Vagrant.config[:vm][:base])
end end
end end
end end