system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-10-14 12:04:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

detect-virt: fix Google Compute Engine support

Browse source 
Follow-up for 9b0688f491
This commit is contained in:
mille-feuille 2024-02-08 23:47:24 +09:00 committed by Yu Watanabe
parent 56afff50b9
commit baa90b4b81
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/basic/virt.c
View file

@ -455,7 +455,7 @@ Virtualization detect_vm(void) {
/* We have to use the correct order here:
*
* → First, try to detect Oracle Virtualbox, Amazon EC2 Nitro, and Parallels, even if they use KVM,
* → First, try to detect Oracle Virtualbox, Amazon EC2 Nitro, Parallels, and Google Compute Engine, even if they use KVM,
* as well as Xen even if it cloaks as Microsoft Hyper-V. Attempt to detect uml at this stage also
* since it runs as a user-process nested inside other VMs. Also check for Xen now, because Xen PV
* mode does not override CPUID when nested inside another hypervisor.
@ -470,7 +470,8 @@ Virtualization detect_vm(void) {
VIRTUALIZATION_ORACLE,
VIRTUALIZATION_XEN,
VIRTUALIZATION_AMAZON,
VIRTUALIZATION_PARALLELS)) {
VIRTUALIZATION_PARALLELS,
VIRTUALIZATION_GOOGLE)) {
v = dmi;
goto finish;
}