From 3b0c8fe66940a610b058cc469e2a218ed938c6c6 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Thu, 11 Oct 2018 12:11:15 +0200 Subject: [PATCH] buildserver: only set disk_bus/nic_model_type if set in config file This makes vagrant/KVM just use the default if these are not set in the makebuildserver.config.py. fdroid/fdroidserver!585 --- buildserver/Vagrantfile | 8 ++++++-- makebuildserver | 2 -- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/buildserver/Vagrantfile b/buildserver/Vagrantfile index 8d8b2877..b9a23279 100644 --- a/buildserver/Vagrantfile +++ b/buildserver/Vagrantfile @@ -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' diff --git a/makebuildserver b/makebuildserver index f43dd489..0c25a08f 100755 --- a/makebuildserver +++ b/makebuildserver @@ -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'):