Show `attempting graceful shutdown` message from action, not guest
This commit is contained in:
parent
0f580fd2c0
commit
7fce25e858
|
@ -9,7 +9,10 @@ module Vagrant
|
|||
|
||||
def call(env)
|
||||
if env[:vm].state == :running
|
||||
env[:vm].guest.halt if !env["force"]
|
||||
if !env["force"]
|
||||
env[:ui].info I18n.t("vagrant.actions.vm.halt.graceful")
|
||||
env[:vm].guest.halt
|
||||
end
|
||||
|
||||
if env[:vm].state != :poweroff
|
||||
env[:ui].info I18n.t("vagrant.actions.vm.halt.force")
|
||||
|
|
|
@ -24,7 +24,6 @@ module Vagrant
|
|||
end
|
||||
|
||||
def halt
|
||||
vm.ui.info I18n.t("vagrant.guest.freebsd.attempting_halt")
|
||||
vm.channel.sudo("shutdown -p now")
|
||||
|
||||
# Wait until the VM's state is actually powered off. If this doesn't
|
||||
|
|
|
@ -20,7 +20,6 @@ module Vagrant
|
|||
end
|
||||
|
||||
def halt
|
||||
vm.ui.info I18n.t("vagrant.guest.linux.attempting_halt")
|
||||
vm.channel.sudo("shutdown -h now")
|
||||
|
||||
# Wait until the VM's state is actually powered off. If this doesn't
|
||||
|
|
|
@ -59,8 +59,6 @@ module Vagrant
|
|||
#
|
||||
# does not exist in /etc/user_attr. TODO
|
||||
def halt
|
||||
vm.ui.info I18n.t("vagrant.guest.solaris.attempting_halt")
|
||||
|
||||
# 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),
|
||||
# then simply return and allow Vagrant to kill the machine.
|
||||
|
|
|
@ -386,7 +386,10 @@ en:
|
|||
the port forwarding doesn't work. If any problems occur, please try a
|
||||
port higher than 1024.
|
||||
halt:
|
||||
force: Forcing shutdown of VM...
|
||||
force: |-
|
||||
Forcing shutdown of VM...
|
||||
graceful: |-
|
||||
Attempting graceful shutdown of VM...
|
||||
host_name:
|
||||
setting: "Setting host name..."
|
||||
import:
|
||||
|
@ -627,7 +630,6 @@ en:
|
|||
back the logic necessary to set this up. Please report a bug as well as the
|
||||
box you're using.
|
||||
linux:
|
||||
attempting_halt: "Attempting graceful shutdown of linux..."
|
||||
mount_fail: "Failed to mount shared folders. `vboxsf` was not available."
|
||||
mount_nfs_fail: |-
|
||||
Mounting NFS shared folders failed. This is most often caused by the NFS
|
||||
|
@ -635,9 +637,3 @@ en:
|
|||
that the NFS client software is properly installed, and consult any resources
|
||||
specific to the linux distro you're using for more information on how to
|
||||
do this.
|
||||
|
||||
solaris:
|
||||
attempting_halt: "Attempting graceful shutdown of solaris..."
|
||||
|
||||
freebsd:
|
||||
attempting_halt: "Attempting graceful shutdown of FreeBSD..."
|
||||
|
|
Loading…
Reference in New Issue