From a12391638acfa342e00e1eff74d36f9509a8a236 Mon Sep 17 00:00:00 2001 From: Fabio Rehm Date: Thu, 18 Apr 2013 03:19:43 -0300 Subject: [PATCH] Change logging to match lxc "verbiage" This should make it clear that we are dealing with LXC containers and not VBox VMs. --- lib/vagrant-lxc/action/boot.rb | 6 +++--- lib/vagrant-lxc/action/forced_halt.rb | 2 +- locales/en.yml | 8 ++++++++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/lib/vagrant-lxc/action/boot.rb b/lib/vagrant-lxc/action/boot.rb index 1268e22..62b0271 100644 --- a/lib/vagrant-lxc/action/boot.rb +++ b/lib/vagrant-lxc/action/boot.rb @@ -11,7 +11,7 @@ module Vagrant 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) raise Vagrant::Errors::VMFailedToBoot if !wait_for_boot @@ -20,11 +20,11 @@ module Vagrant # Stolen from on VagrantPlugins::ProviderVirtualBox::Action::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| 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 end diff --git a/lib/vagrant-lxc/action/forced_halt.rb b/lib/vagrant-lxc/action/forced_halt.rb index cb9c670..264c66a 100644 --- a/lib/vagrant-lxc/action/forced_halt.rb +++ b/lib/vagrant-lxc/action/forced_halt.rb @@ -8,7 +8,7 @@ module Vagrant def call(env) 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 # work we can issue a lxc-stop. env[:machine].provider.driver.halt diff --git a/locales/en.yml b/locales/en.yml index 7d64447..1242a75 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -8,6 +8,14 @@ en: will_not_destroy: |- The container '%{name}' will not be destroyed, since the confirmation 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 vagrant: