diff options
| author | Jan Losinski <losinski@wh2.tu-dresden.de> | 2019-08-29 15:45:51 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-08-30 12:20:38 +0200 |
| commit | 87bc4b40fca5e46d86367bf9deef45830469e946 (patch) | |
| tree | 426fb1714ab5ea56e5b92e83179ec9b61e42c8bc | |
| parent | 013a87517d0a6682d7140321ce80d18c54fd1f57 (diff) | |
| download | systemd-87bc4b40fca5e46d86367bf9deef45830469e946.tar.gz | |
basic/virt: Fix current virtualbox detection
In a current VirtualBox installation the board_vendor is set to "Oracle
Corporation". So we need to add this to the dmi_vendor_table for a
relieable detection.
This fixes #13429
Signed-off-by: Jan Losinski <losinski@wh2.tu-dresden.de>
| -rw-r--r-- | src/basic/virt.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/basic/virt.c b/src/basic/virt.c index 7a7400773b..65a36037d9 100644 --- a/src/basic/virt.c +++ b/src/basic/virt.c @@ -140,17 +140,18 @@ static int detect_vm_dmi(void) { const char *vendor; int id; } dmi_vendor_table[] = { - { "KVM", VIRTUALIZATION_KVM }, - { "QEMU", VIRTUALIZATION_QEMU }, + { "KVM", VIRTUALIZATION_KVM }, + { "QEMU", VIRTUALIZATION_QEMU }, /* http://kb.vmware.com/selfservice/microsites/search.do?language=en_US&cmd=displayKC&externalId=1009458 */ - { "VMware", VIRTUALIZATION_VMWARE }, - { "VMW", VIRTUALIZATION_VMWARE }, - { "innotek GmbH", VIRTUALIZATION_ORACLE }, - { "Xen", VIRTUALIZATION_XEN }, - { "Bochs", VIRTUALIZATION_BOCHS }, - { "Parallels", VIRTUALIZATION_PARALLELS }, + { "VMware", VIRTUALIZATION_VMWARE }, + { "VMW", VIRTUALIZATION_VMWARE }, + { "innotek GmbH", VIRTUALIZATION_ORACLE }, + { "Oracle Corporation", VIRTUALIZATION_ORACLE }, + { "Xen", VIRTUALIZATION_XEN }, + { "Bochs", VIRTUALIZATION_BOCHS }, + { "Parallels", VIRTUALIZATION_PARALLELS }, /* https://wiki.freebsd.org/bhyve */ - { "BHYVE", VIRTUALIZATION_BHYVE }, + { "BHYVE", VIRTUALIZATION_BHYVE }, }; unsigned i; int r; |