diff --git a/plugins/provisioners/chef/config/chef_zero.rb b/plugins/provisioners/chef/config/chef_zero.rb index d02f78f6f..c19485f88 100644 --- a/plugins/provisioners/chef/config/chef_zero.rb +++ b/plugins/provisioners/chef/config/chef_zero.rb @@ -120,7 +120,7 @@ module VagrantPlugins # Make sure all the paths are in the proper format config.map do |path| - path = [:host, path] if !path.is_a?(Array) + path = [:host, File.expand_path(path)] if !path.is_a?(Array) path end end diff --git a/plugins/provisioners/chef/provisioner/chef_zero.rb b/plugins/provisioners/chef/provisioner/chef_zero.rb index afb79e8ea..72e2ea26b 100644 --- a/plugins/provisioners/chef/provisioner/chef_zero.rb +++ b/plugins/provisioners/chef/provisioner/chef_zero.rb @@ -62,11 +62,11 @@ module VagrantPlugins local_mode: true, ) - still_active = 259 #provisioner has asked chef to reboot - + 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