summaryrefslogtreecommitdiffstats
path: root/vagrant/Vagrantfile
diff options
context:
space:
mode:
authorTails developers <amnesia@boum.org>2013-12-21 12:30:59 +0000
committerTails developers <amnesia@boum.org>2013-12-21 12:30:59 +0000
commit460ed6a57d06d2bb203ef386c854df7f9951ad80 (patch)
treefef85b82c8739053f6ac3db118f4060cec95f6e4 /vagrant/Vagrantfile
parenta0876e2ca6d366018720ef33898420ec8771f62b (diff)
Remove spurious trailing whitespace introduced by this branch.
Diffstat (limited to 'vagrant/Vagrantfile')
-rw-r--r--vagrant/Vagrantfile4
1 files changed, 2 insertions, 2 deletions
diff --git a/vagrant/Vagrantfile b/vagrant/Vagrantfile
index 3f097e8..4225f91 100644
--- a/vagrant/Vagrantfile
+++ b/vagrant/Vagrantfile
@@ -35,11 +35,11 @@ if vagrant_old
Vagrant::Config.run do |config|
config.vm.box = 'tails'
config.vm.box_url = 'http://dl.amnesia.boum.org/tails/project/vagrant/squeeze.box'
-
+
config.vm.provision :shell, :inline => "http_proxy='#{ENV['http_proxy']}' /vagrant/provision/setup-tails-builder"
config.vm.share_folder 'amnesia', '/amnesia.git', '../.git'
-
+
config.vm.customize ['modifyvm', :id, '--memory', mem_size]
config.vm.customize ['modifyvm', :id, '--cpus', cpus] unless cpus.nil?
end