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

Re-namespace messages for systems to the vagrant.guest

This commit is contained in:
Mitchell Hashimoto 2011-12-15 21:07:43 -08:00
parent 1fcca71ce9
commit 7157bd9cdb
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/vagrant/guest/base.rb
View File

@ -16,7 +16,7 @@ module Vagrant
# changes will be noted on release notes.** # changes will be noted on release notes.**
class Base class Base
class BaseError < Errors::VagrantError class BaseError < Errors::VagrantError
error_namespace("vagrant.systems.base") error_namespace("vagrant.guest.base")
end end
include Vagrant::Util include Vagrant::Util

4
lib/vagrant/guest/freebsd.rb
View File

@ -20,11 +20,11 @@ module Vagrant
# Here for whenever it may be used. # Here for whenever it may be used.
class FreeBSDError < Errors::VagrantError class FreeBSDError < Errors::VagrantError
error_namespace("vagrant.systems.freebsd") error_namespace("vagrant.guest.freebsd")
end end
def halt def halt
vm.env.ui.info I18n.t("vagrant.systems.freebsd.attempting_halt") vm.env.ui.info I18n.t("vagrant.guest.freebsd.attempting_halt")
vm.ssh.execute do |ssh| vm.ssh.execute do |ssh|
ssh.exec!("sudo shutdown -p now") ssh.exec!("sudo shutdown -p now")
end end

2
lib/vagrant/guest/linux.rb
View File

@ -22,7 +22,7 @@ module Vagrant
end end
def halt def halt
vm.env.ui.info I18n.t("vagrant.systems.linux.attempting_halt") vm.env.ui.info I18n.t("vagrant.guest.linux.attempting_halt")
vm.ssh.execute do |ssh| vm.ssh.execute do |ssh|
ssh.exec!("sudo shutdown -h now") ssh.exec!("sudo shutdown -h now")
end end

2
lib/vagrant/guest/linux/error.rb
View File

@ -2,7 +2,7 @@ module Vagrant
module Guest module Guest
class Linux < Vagrant::Guest::Base class Linux < Vagrant::Guest::Base
class LinuxError < Errors::VagrantError class LinuxError < Errors::VagrantError
error_namespace("vagrant.systems.linux") error_namespace("vagrant.guest.linux")
end end
end end
end end

4
lib/vagrant/guest/solaris.rb
View File

@ -25,7 +25,7 @@ module Vagrant
# Here for whenever it may be used. # Here for whenever it may be used.
class SolarisError < Errors::VagrantError class SolarisError < Errors::VagrantError
error_namespace("vagrant.systems.solaris") error_namespace("vagrant.guest.solaris")
end end
def prepare_host_only_network(net_options=nil) def prepare_host_only_network(net_options=nil)
@ -61,7 +61,7 @@ module Vagrant
# #
# does not exist in /etc/user_attr. TODO # does not exist in /etc/user_attr. TODO
def halt def halt
vm.env.ui.info I18n.t("vagrant.systems.solaris.attempting_halt") vm.env.ui.info I18n.t("vagrant.guest.solaris.attempting_halt")
vm.ssh.execute do |ssh| vm.ssh.execute do |ssh|
# Wait until the VM's state is actually powered off. If this doesn't # Wait until the VM's state is actually powered off. If this doesn't
# occur within a reasonable amount of time (15 seconds by default), # occur within a reasonable amount of time (15 seconds by default),

2
templates/locales/en.yml
View File

@ -537,7 +537,7 @@ en:
path_invalid: "`path` for shell provisioner does not exist on the host system: %{path}" path_invalid: "`path` for shell provisioner does not exist on the host system: %{path}"
upload_path_not_set: "`upload_path` must be set for the shell provisioner." upload_path_not_set: "`upload_path` must be set for the shell provisioner."
systems: guest:
base: base:
unsupported_host_only: |- unsupported_host_only: |-
Host only networking is very distro-specific. Vagrant has support for many Host only networking is very distro-specific. Vagrant has support for many