plugins/provisioners/chef/provisioner/chef_solo.rb in vagrant-unbundled-2.0.4.0 vs plugins/provisioners/chef/provisioner/chef_solo.rb in vagrant-unbundled-2.1.1.0

- old
+ new

@@ -99,11 +99,12 @@ # Remove drive letter if running on a windows host. This is a bit # of a hack but is the most portable way I can think of at the moment # to achieve this. Otherwise, Vagrant attempts to share at some crazy # path like /home/vagrant/c:/foo/bar - remote_path = File.expand_path(path.gsub(/^[a-zA-Z]:\//, "/"), guest_provisioning_path.gsub(/^[a-zA-Z]:\//, "/")) + remote_path = File.expand_path(path.sub(/^[a-zA-Z]:\//, "/"), guest_provisioning_path.sub(/^[a-zA-Z]:\//, "/")) + remote_path.sub!(/^[a-zA-Z]:\//, "/") end # If we have specified a folder name to append then append it if type == :host remote_path += "/#{appended_folder}" if appended_folder @@ -181,13 +182,13 @@ colored: @machine.env.ui.color?, legacy_mode: @config.legacy_mode, ) still_active = 259 #provisioner has asked chef to reboot - + @config.attempts.times do |attempt| exit_status = 0 - while exit_status == 0 || exit_status == still_active + while exit_status == 0 || exit_status == still_active if @machine.guest.capability?(:wait_for_reboot) @machine.guest.capability(:wait_for_reboot) elsif attempt > 0 sleep 10 @machine.communicate.wait_for_ready(@machine.config.vm.boot_timeout)