Commit 83e93696 authored by Michael Pöhn's avatar Michael Pöhn

put provider in resulting box file names

parent 16986882
fdroid-jessie64.box
fdroid-jessie64-libvirt.box
fdroid-jessie64-virtualbox.box
fdroid-stretch64-libvirt.box
fdroid-stretch64-virtualbox.box
debootstrap.log
tests/extra/test-libvirt/.vagrant
......
......@@ -22,13 +22,13 @@ This section describes the primary intended use case for
#### Bootstrap and add box:
sudo ./makebuildserver_basebox.py --provider libvirt
vagrant box add jessie64 fdroid-jessie64.box
vagrant box add jessie64 fdroid-jessie64-libvirt.box
That's it, _makebuildserver.py_ should be able to find the basebox now.
#### (optional) cleanup:
rm fdroid-jessie64.box
rm fdroid-jessie64-libvirt.box
### synopsis
......
......@@ -62,7 +62,8 @@ def init_params(provider, debver, workdir='.'):
'fdroidserver-customize.sh'),
'username': 'vagrant',
'password': 'vagrant',
'boxfile': 'fdroid-{}.box'.format(debver)}
'boxfile': 'fdroid-{debver}-{provider}.box'.format(
debver=debver, provider=provider)}
params['size_bytes'] = vm_size_str_to_bytes(params['size'])
params['size_megs'] = math.ceil(params['size_bytes'] / (2.**20))
params['size_gigs'] = math.ceil(params['size_bytes'] / (2.**30))
......
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