Commit 7e7e1d5f authored by intrigeri's avatar intrigeri
Browse files

Merge branch 'stable' into devel

parents eb8939e2 cd812efb
......@@ -56,7 +56,7 @@ Vagrant.configure("2") do |config|
domain.cpus = cpus unless cpus.nil?
if ENV['TAILS_PROXY_TYPE' ] == 'vmproxy'
domain.storage(
:file, size: '15G', allow_existing: true, cache: 'none',
:file, size: '15G', allow_existing: true,
path: 'apt-cacher-ng-data.qcow2'
)
end
......
......@@ -26,6 +26,6 @@ DISTRIBUTION = "stretch"
def box_name
git_root = `git rev-parse --show-toplevel`.chomp
shortid, date = `git log -1 --date="format:%Y%m%d" --pretty="%h %ad" -- \
#{git_root}/vagrant/definitions/tails-builder/`.chomp.split
#{git_root}/vagrant/`.chomp.split
return "tails-builder-#{ARCHITECTURE}-#{DISTRIBUTION}-#{date}-#{shortid}"
end
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment