mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-04 22:40:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

buildserver: only set disk_bus/nic_model_type if set in config file

Browse source 
This makes vagrant/KVM just use the default if these are not set in the
makebuildserver.config.py.

fdroid/fdroidserver!585
This commit is contained in:
Hans-Christoph Steiner 2018-10-11 12:11:15 +02:00
parent 9458a69c54
commit 3b0c8fe669
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
buildserver/Vagrantfile vendored
View file

@ -34,8 +34,12 @@ Vagrant.configure("2") do |config|
libvirt.uri = "qemu:///system"
libvirt.cpus = configfile["cpus"]
libvirt.memory = configfile["memory"]
libvirt.disk_bus = configfile["libvirt_disk_bus"]
libvirt.nic_model_type = configfile["libvirt_nic_model_type"]
if configfile.has_key? "libvirt_disk_bus"
libvirt.disk_bus = configfile["libvirt_disk_bus"]
end
if configfile.has_key? "libvirt_nic_model_type"
libvirt.nic_model_type = configfile["libvirt_nic_model_type"]
end
end
config.vm.synced_folder './', '/vagrant', type: '9p'
synced_folder_type = '9p'