mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-10-05 18:50:09 +02:00
Merge branch 'use-libvirt-defaults' into 'master'
buildserver: only set disk_bus/nic_model_type if set in config file See merge request fdroid/fdroidserver!586
This commit is contained in:
commit
9a85f0007c
8
buildserver/Vagrantfile
vendored
8
buildserver/Vagrantfile
vendored
@ -34,8 +34,12 @@ Vagrant.configure("2") do |config|
|
|||||||
libvirt.uri = "qemu:///system"
|
libvirt.uri = "qemu:///system"
|
||||||
libvirt.cpus = configfile["cpus"]
|
libvirt.cpus = configfile["cpus"]
|
||||||
libvirt.memory = configfile["memory"]
|
libvirt.memory = configfile["memory"]
|
||||||
libvirt.disk_bus = configfile["libvirt_disk_bus"]
|
if configfile.has_key? "libvirt_disk_bus"
|
||||||
libvirt.nic_model_type = configfile["libvirt_nic_model_type"]
|
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
|
end
|
||||||
config.vm.synced_folder './', '/vagrant', type: '9p'
|
config.vm.synced_folder './', '/vagrant', type: '9p'
|
||||||
synced_folder_type = '9p'
|
synced_folder_type = '9p'
|
||||||
|
@ -65,8 +65,6 @@ config = {
|
|||||||
'memory': 2048,
|
'memory': 2048,
|
||||||
'hwvirtex': 'off',
|
'hwvirtex': 'off',
|
||||||
'vm_provider': 'virtualbox',
|
'vm_provider': 'virtualbox',
|
||||||
'libvirt_disk_bus': 'virtio',
|
|
||||||
'libvirt_nic_model_type': 'virtio',
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if os.path.isfile('/usr/bin/systemd-detect-virt'):
|
if os.path.isfile('/usr/bin/systemd-detect-virt'):
|
||||||
|
Loading…
Reference in New Issue
Block a user