1
0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-18 20:50:10 +01:00

buildserver: add config option to use 'nfs' instead of '9p'

'9p' is not possible when running KVM in VMware.  Also, 'nfs' might provide
more reliably operation on systems that are properly setup for it.
This commit is contained in:
Hans-Christoph Steiner 2018-12-13 22:02:46 +01:00
parent a2aef721d8
commit 4c5864c975
2 changed files with 13 additions and 2 deletions

View File

@ -43,8 +43,12 @@ Vagrant.configure("2") do |config|
libvirt.nic_model_type = configfile["libvirt_nic_model_type"] libvirt.nic_model_type = configfile["libvirt_nic_model_type"]
end end
end end
config.vm.synced_folder './', '/vagrant', type: '9p' if configfile.has_key? "synced_folder_type"
synced_folder_type = configfile["synced_folder_type"]
else
synced_folder_type = '9p' synced_folder_type = '9p'
end
config.vm.synced_folder './', '/vagrant', type: synced_folder_type
else else
abort("No supported VM Provider found, set vm_provider in Vagrantfile.yaml!") abort("No supported VM Provider found, set vm_provider in Vagrantfile.yaml!")
end end

View File

@ -85,3 +85,10 @@
# #
# libvirt_disk_bus = 'sata' # libvirt_disk_bus = 'sata'
# libvirt_nic_model_type = 'rtl8139' # libvirt_nic_model_type = 'rtl8139'
# Sometimes, it is not possible to use the 9p synced folder type with
# libvirt, like if running a KVM buildserver instance inside of a
# VMware ESXi guest. In that case, using NFS or another method is
# required.
#
# synced_folder_type = 'nfs'