From bd551174baaf083621cde44380b763a259a22978 Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Mon, 22 Feb 2010 23:15:21 -0800 Subject: [PATCH] Removed traces of ovf_file usage in actions --- lib/vagrant/actions/vm/import.rb | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/lib/vagrant/actions/vm/import.rb b/lib/vagrant/actions/vm/import.rb index df9e2d459..802678e5d 100644 --- a/lib/vagrant/actions/vm/import.rb +++ b/lib/vagrant/actions/vm/import.rb @@ -2,19 +2,12 @@ module Vagrant module Actions module VM 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! @runner.invoke_around_callback(:import) 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 - @runner.vm = VirtualBox::VM.import(@ovf_file) + @runner.vm = VirtualBox::VM.import(Vagrant.config[:vm][:base]) end end end