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

Fix graceful_halt_timeout issue #8486

This commit is contained in:
Adam Paul 2018-03-15 10:38:07 -04:00
parent 586ee5bfba
commit 76551a1692
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/guests/windows/cap/change_host_name.rb
View File

@ -4,10 +4,10 @@ module VagrantPlugins
module ChangeHostName module ChangeHostName
def self.change_host_name(machine, name) def self.change_host_name(machine, name)
change_host_name_and_wait(machine, name, machine.config.vm.graceful_halt_timeout) change_host_name_and_wait(machine, name)
end end
def self.change_host_name_and_wait(machine, name, sleep_timeout) def self.change_host_name_and_wait(machine, name)
# If the configured name matches the current name, then bail # If the configured name matches the current name, then bail
# We cannot use %ComputerName% because it truncates at 15 chars # We cannot use %ComputerName% because it truncates at 15 chars
return if machine.communicate.test("if ([System.Net.Dns]::GetHostName() -eq '#{name}') { exit 0 } exit 1") return if machine.communicate.test("if ([System.Net.Dns]::GetHostName() -eq '#{name}') { exit 0 } exit 1")
@ -28,7 +28,7 @@ module VagrantPlugins
error_key: :rename_computer_failed) error_key: :rename_computer_failed)
# Don't continue until the machine has shutdown and rebooted # Don't continue until the machine has shutdown and rebooted
sleep(sleep_timeout) machine.guest.capability(:wait_for_reboot)
end end
end end
end end