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

Fix up some stuff from previous pull request

This commit is contained in:
Mitchell Hashimoto 2012-03-30 19:31:03 -07:00
parent db6cd14f9e
commit 1782acdf2e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/vagrant/driver/virtualbox.rb
View File

@ -122,11 +122,11 @@ module Vagrant
output = execute("--version") output = execute("--version")
if output =~ /vboxdrv kernel module is not loaded/ if output =~ /vboxdrv kernel module is not loaded/
raise Errors::VirtualBoxKernelModuleNotLoaded raise Errors::VirtualBoxKernelModuleNotLoaded
elsif output =~ /Please install/
# Check for installation incomplete warnings, for example: # Check for installation incomplete warnings, for example:
# "WARNING: The character device /dev/vboxdrv does not # "WARNING: The character device /dev/vboxdrv does not
# exist. Please install the virtualbox-ose-dkms package and # exist. Please install the virtualbox-ose-dkms package and
# the appropriate headers, most likely linux-headers-generic." # the appropriate headers, most likely linux-headers-generic."
elsif output =~ /Please install/
raise Errors::VirtualBoxInstallIncomplete raise Errors::VirtualBoxInstallIncomplete
end end

2
lib/vagrant/errors.rb
View File

@ -389,7 +389,7 @@ module Vagrant
end end
class VirtualBoxInstallIncomplete < VagrantError class VirtualBoxInstallIncomplete < VagrantError
status_code(79) status_code(80)
error_key(:virtualbox_install_incomplete) error_key(:virtualbox_install_incomplete)
end end