Skip to content
Browse files

Re-re-re-resolve conflict

  • Loading branch information...
1 parent 72715ba commit e32f8e5b61f42be74fcb4789cf60348b69b983fd @michaelklishin michaelklishin committed
Showing with 7 additions and 6 deletions.
  1. +7 −6 vagrant_base/travis_build_environment/recipes/vagrant.rb
View
13 vagrant_base/travis_build_environment/recipes/vagrant.rb
@@ -55,11 +55,12 @@
action :create
end
-
-mount "/home/vagrant/builds" do
- fstype "tmpfs"
- device "/dev/null" # http://tickets.opscode.com/browse/CHEF-1657, doesn't seem to be included in 0.10.0
- options "defaults,size=#{node[:travis_build_environment][:builds_volume_size]},noatime"
- action [:mount, :enable]
+if node[:use_tmpfs]
+ mount "/home/vagrant/builds" do
+ fstype "tmpfs"
+ device "/dev/null" # http://tickets.opscode.com/browse/CHEF-1657, doesn't seem to be included in 0.10.0
+ options "defaults,size=#{node[:travis_build_environment][:builds_volume_size]},noatime"
+ action [:mount, :enable]
+ end
end

0 comments on commit e32f8e5

Please sign in to comment.
Something went wrong with that request. Please try again.