glenux/vagrant-lxc-ng
glenux/vagrant-lxc-ng
1
0
Fork 0
Code Issues 4 Pull requests Projects 1 Releases Packages Wiki Activity

Change logging to match lxc "verbiage"

Browse source 
This should make it clear that we are dealing with LXC containers and
not VBox VMs.
This commit is contained in:
Fabio Rehm 2013-04-18 03:19:43 -03:00
parent 10914d53b0
commit a12391638a
3 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/vagrant-lxc/action/boot.rb
View file

@ -11,7 +11,7 @@ module Vagrant
config = env[:machine].provider_config config = env[:machine].provider_config
env[:ui].info I18n.t("vagrant.actions.vm.boot.booting") env[:ui].info I18n.t("vagrant_lxc.messages.starting")
env[:machine].provider.driver.start(config.customizations) env[:machine].provider.driver.start(config.customizations)
raise Vagrant::Errors::VMFailedToBoot if !wait_for_boot raise Vagrant::Errors::VMFailedToBoot if !wait_for_boot
@ -20,11 +20,11 @@ module Vagrant
# Stolen from on VagrantPlugins::ProviderVirtualBox::Action::Boot # Stolen from on VagrantPlugins::ProviderVirtualBox::Action::Boot
def wait_for_boot def wait_for_boot
@env[:ui].info I18n.t("vagrant.actions.vm.boot.waiting") @env[:ui].info I18n.t("vagrant_lxc.messages.waiting_for_start")
@env[:machine].config.ssh.max_tries.to_i.times do |i| @env[:machine].config.ssh.max_tries.to_i.times do |i|
if @env[:machine].communicate.ready? if @env[:machine].communicate.ready?
@env[:ui].info I18n.t("vagrant.actions.vm.boot.ready") @env[:ui].info I18n.t("vagrant_lxc.messages.container_ready")
return true return true
end end

2
lib/vagrant-lxc/action/forced_halt.rb
View file

@ -8,7 +8,7 @@ module Vagrant
def call(env) def call(env)
if env[:machine].provider.state.id == :running if env[:machine].provider.state.id == :running
env[:ui].info I18n.t("vagrant.actions.vm.halt.force") env[:ui].info I18n.t("vagrant_lxc.messages.force_shutdown")
# TODO: Driver#halt is kinda graceful as well, if it doesn't # TODO: Driver#halt is kinda graceful as well, if it doesn't
# work we can issue a lxc-stop. # work we can issue a lxc-stop.
env[:machine].provider.driver.halt env[:machine].provider.driver.halt

8
locales/en.yml
View file

@ -8,6 +8,14 @@ en:
will_not_destroy: |- will_not_destroy: |-
The container '%{name}' will not be destroyed, since the confirmation The container '%{name}' will not be destroyed, since the confirmation
was declined. was declined.
starting: |-
Starting container...
waiting_for_start: |-
Waiting for container to start. This should not take long.
container_ready: |-
Container started and ready for use!
force_shutdown: |-
Forcing shutdown of container...
# TODO: Review messages below # TODO: Review messages below
vagrant: vagrant: