Skip to content

Commit

Permalink
Merge pull request #37 from juliandunn/experimental-windows-support
Browse files Browse the repository at this point in the history
fix Windows box builds for Vagrant 1.1
  • Loading branch information
juliandunn committed Apr 22, 2013

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
2 parents 71cdaa3 + 6dddcf3 commit f09c1fd
Showing 3 changed files with 12 additions and 1 deletion.
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -2,5 +2,6 @@ source "https://rubygems.org"

gem "vagrant", :git => 'https://github.com/mitchellh/vagrant.git', :tag => 'v1.1.5'
gem "veewee", :git => 'https://github.com/jedi4ever/veewee.git', :ref => '164a10dd24'
gem "vagrant-windows", :git => 'https://github.com/sneal/vagrant-windows.git', :branch => 'vagrant-1.1-plugin-architecture-vbox4.1' # mainline vagrant-windows isn't working yet with Vagrant 1.1
gem "em-winrm" # for windows!
gem "rake"
10 changes: 10 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -32,6 +32,15 @@ GIT
net-scp (~> 1.1.0)
net-ssh (~> 2.6.6)

GIT
remote: https://github.com/sneal/vagrant-windows.git
revision: fbe11646d674e2ee5253089b958fdc2e573aab78
branch: vagrant-1.1-plugin-architecture-vbox4.1
specs:
vagrant-windows (0.2.0)
highline
winrm (~> 1.1.1)

GEM
remote: https://rubygems.org/
specs:
@@ -135,4 +144,5 @@ DEPENDENCIES
em-winrm
rake
vagrant!
vagrant-windows!
veewee!
2 changes: 1 addition & 1 deletion definitions/.windows/install-chef.bat
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
timeout 10
REM sleeping to give outbound networking a chance to come up
cmd /C cscript wget.vbs /url:http://www.opscode.com/chef/install.msi /path:chef-client.msi
cmd /C cscript %TEMP%\wget.vbs /url:http://www.opscode.com/chef/install.msi /path:chef-client.msi
cmd /C msiexec /qn /i chef-client.msi


0 comments on commit f09c1fd

Please sign in to comment.