Fixed some middleware ordering and include util for checking guest additions

This commit is contained in:
Mitchell Hashimoto 2010-07-05 17:51:41 +02:00
parent d986fdf041
commit 9ac9e49ba1
3 changed files with 15 additions and 1 deletions

View File

@ -12,9 +12,9 @@ module Vagrant
use VM::CheckGuestAdditions use VM::CheckGuestAdditions
use VM::Customize use VM::Customize
use VM::ForwardPorts use VM::ForwardPorts
use VM::Provision
use VM::ShareFolders use VM::ShareFolders
use VM::Network use VM::Network
use VM::Provision
use VM::Boot use VM::Boot
end end

View File

@ -5,6 +5,8 @@ module Vagrant
# installed and prints a warning if they're not detected or if the # installed and prints a warning if they're not detected or if the
# version does not match the installed VirtualBox version. # version does not match the installed VirtualBox version.
class CheckGuestAdditions class CheckGuestAdditions
include Util
def initialize(app, env) def initialize(app, env)
@app = app @app = app
end end

View File

@ -39,11 +39,15 @@ Gem::Specification.new do |s|
"lib/vagrant/action/environment.rb", "lib/vagrant/action/environment.rb",
"lib/vagrant/action/error_halt.rb", "lib/vagrant/action/error_halt.rb",
"lib/vagrant/action/vm/boot.rb", "lib/vagrant/action/vm/boot.rb",
"lib/vagrant/action/vm/check_guest_additions.rb",
"lib/vagrant/action/vm/customize.rb", "lib/vagrant/action/vm/customize.rb",
"lib/vagrant/action/vm/destroy_unused_network_interfaces.rb",
"lib/vagrant/action/vm/forward_ports.rb", "lib/vagrant/action/vm/forward_ports.rb",
"lib/vagrant/action/vm/import.rb", "lib/vagrant/action/vm/import.rb",
"lib/vagrant/action/vm/match_mac_address.rb", "lib/vagrant/action/vm/match_mac_address.rb",
"lib/vagrant/action/vm/network.rb",
"lib/vagrant/action/vm/persist.rb", "lib/vagrant/action/vm/persist.rb",
"lib/vagrant/action/vm/provision.rb",
"lib/vagrant/action/vm/share_folders.rb", "lib/vagrant/action/vm/share_folders.rb",
"lib/vagrant/actions/base.rb", "lib/vagrant/actions/base.rb",
"lib/vagrant/actions/box/add.rb", "lib/vagrant/actions/box/add.rb",
@ -129,11 +133,15 @@ Gem::Specification.new do |s|
"test/vagrant/action/environment_test.rb", "test/vagrant/action/environment_test.rb",
"test/vagrant/action/error_halt_test.rb", "test/vagrant/action/error_halt_test.rb",
"test/vagrant/action/vm/boot_test.rb", "test/vagrant/action/vm/boot_test.rb",
"test/vagrant/action/vm/check_guest_additions_test.rb",
"test/vagrant/action/vm/customize_test.rb", "test/vagrant/action/vm/customize_test.rb",
"test/vagrant/action/vm/destroy_unused_network_interfaces_test.rb",
"test/vagrant/action/vm/forward_ports_test.rb", "test/vagrant/action/vm/forward_ports_test.rb",
"test/vagrant/action/vm/import_test.rb", "test/vagrant/action/vm/import_test.rb",
"test/vagrant/action/vm/match_mac_address_test.rb", "test/vagrant/action/vm/match_mac_address_test.rb",
"test/vagrant/action/vm/network_test.rb",
"test/vagrant/action/vm/persist_test.rb", "test/vagrant/action/vm/persist_test.rb",
"test/vagrant/action/vm/provision_test.rb",
"test/vagrant/action/vm/share_folders_test.rb", "test/vagrant/action/vm/share_folders_test.rb",
"test/vagrant/action_test.rb", "test/vagrant/action_test.rb",
"test/vagrant/actions/base_test.rb", "test/vagrant/actions/base_test.rb",
@ -217,11 +225,15 @@ Gem::Specification.new do |s|
"test/vagrant/action/environment_test.rb", "test/vagrant/action/environment_test.rb",
"test/vagrant/action/error_halt_test.rb", "test/vagrant/action/error_halt_test.rb",
"test/vagrant/action/vm/boot_test.rb", "test/vagrant/action/vm/boot_test.rb",
"test/vagrant/action/vm/check_guest_additions_test.rb",
"test/vagrant/action/vm/customize_test.rb", "test/vagrant/action/vm/customize_test.rb",
"test/vagrant/action/vm/destroy_unused_network_interfaces_test.rb",
"test/vagrant/action/vm/forward_ports_test.rb", "test/vagrant/action/vm/forward_ports_test.rb",
"test/vagrant/action/vm/import_test.rb", "test/vagrant/action/vm/import_test.rb",
"test/vagrant/action/vm/match_mac_address_test.rb", "test/vagrant/action/vm/match_mac_address_test.rb",
"test/vagrant/action/vm/network_test.rb",
"test/vagrant/action/vm/persist_test.rb", "test/vagrant/action/vm/persist_test.rb",
"test/vagrant/action/vm/provision_test.rb",
"test/vagrant/action/vm/share_folders_test.rb", "test/vagrant/action/vm/share_folders_test.rb",
"test/vagrant/action_test.rb", "test/vagrant/action_test.rb",
"test/vagrant/actions/base_test.rb", "test/vagrant/actions/base_test.rb",