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

Move Windows symlink re-establishment after reboot into capability 

This reduces the complexity and likelihood of provisioner bugs.
This commit is contained in:
Shawn Neal 2014-04-29 12:58:47 -07:00
parent 9c420b8738
commit 068b5cf0b9
4 changed files with 4 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/guests/windows/cap/reboot.rb
View File

@ -12,6 +12,10 @@ module VagrantPlugins
while machine.communicate.execute(script, error_check: false) != 0 while machine.communicate.execute(script, error_check: false) != 0
sleep 10 sleep 10
end end
# This re-establishes our symbolic links if they were
# created between now and a reboot
machine.communicate.execute("net use", error_check: false)
end end
end end
end end

8
plugins/provisioners/chef/provisioner/chef_client.rb
View File

@ -62,14 +62,6 @@ module VagrantPlugins
@machine.guest.capability(:wait_for_reboot) @machine.guest.capability(:wait_for_reboot)
end end
if windows?
# This re-establishes our symbolic links if they were
# created between now and a reboot
@machine.communicate.execute(
"& net use a-non-existant-share",
error_check: false)
end
command = build_command(:client) command = build_command(:client)
@config.attempts.times do |attempt| @config.attempts.times do |attempt|

8
plugins/provisioners/chef/provisioner/chef_solo.rb
View File

@ -138,14 +138,6 @@ module VagrantPlugins
@machine.guest.capability(:wait_for_reboot) @machine.guest.capability(:wait_for_reboot)
end end
if windows?
# This re-establishes our symbolic links if they were
# created between now and a reboot
@machine.communicate.execute(
"& net use a-non-existant-share",
error_check: false)
end
command = build_command(:solo) command = build_command(:solo)
@config.attempts.times do |attempt| @config.attempts.times do |attempt|

8
plugins/provisioners/puppet/provisioner/puppet.rb
View File

@ -101,14 +101,6 @@ module VagrantPlugins
end end
def run_puppet_apply def run_puppet_apply
if windows?
# This re-establishes our symbolic links if they were
# created between now and a reboot
@machine.communicate.execute(
"& net use a-non-existant-share",
error_check: false)
end
default_module_path = "/etc/puppet/modules" default_module_path = "/etc/puppet/modules"
if windows? if windows?
default_module_path = "/ProgramData/PuppetLabs/puppet/etc/modules" default_module_path = "/ProgramData/PuppetLabs/puppet/etc/modules"