chiark
/
gitweb
/
~ianmdlvl
/
fdroidserver.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
1e8fd01
)
buildserver: bochs can also be used with KVM
author
Hans-Christoph Steiner
<hans@eds.org>
Fri, 23 Sep 2016 15:40:23 +0000
(17:40 +0200)
committer
Hans-Christoph Steiner
<hans@eds.org>
Fri, 23 Sep 2016 15:41:41 +0000
(17:41 +0200)
jenkins.debian.net is being detected as 'bochs' rather than 'qemu'.
makebuildserver
patch
|
blob
|
history
diff --git
a/makebuildserver
b/makebuildserver
index a5328f87f99aec845f8752bab3d8a7d4cffe07ea..14624b582c97cd972e6bb1f2251632eb4e662310 100755
(executable)
--- a/
makebuildserver
+++ b/
makebuildserver
@@
-72,7
+72,7
@@
if os.path.isfile('/usr/bin/systemd-detect-virt'):
virt = subprocess.check_output('/usr/bin/systemd-detect-virt').strip().decode('utf-8')
except subprocess.CalledProcessError as e:
virt = 'none'
- if virt == 'qemu' or virt == 'kvm':
+ if virt == 'qemu' or virt == 'kvm'
or virt == 'bochs'
:
print('Running in a VM guest, defaulting to QEMU/KVM via libvirt')
config['vm_provider'] = 'libvirt'
elif virt != 'none':