kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-07-07 09:50:07 +02:00
Code Activity

Merge branch 'use-libvirt-defaults' into 'master'

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

See merge request fdroid/fdroidserver!586
This commit is contained in:
Michael Pöhn 2018-10-11 10:32:19 +00:00
commit 9a85f0007c
2 changed files with 6 additions and 4 deletions
Show Stats 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'

2
makebuildserver
View File

@ -65,8 +65,6 @@ config = {
'memory': 2048,
'hwvirtex': 'off',
'vm_provider': 'virtualbox',
'libvirt_disk_bus': 'virtio',
'libvirt_nic_model_type': 'virtio',
}
if os.path.isfile('/usr/bin/systemd-detect-virt'):