From: Benjamin Robin <benjarobin@users.noreply.github.com>
Date: Fri, 17 Feb 2017 07:45:30 +0000 (+0100)
Subject: virt: Update cache if the detected vm is virtualbox (#5364)
X-Git-Tag: v233.3~57
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=f9ddcf23d54a8c9673163e5cca12fa8ab4814f74;p=elogind.git

virt: Update cache if the detected vm is virtualbox (#5364)
---

diff --git a/src/basic/virt.c b/src/basic/virt.c
index 66ce7ecfe..276df8352 100644
--- a/src/basic/virt.c
+++ b/src/basic/virt.c
@@ -328,8 +328,10 @@ int detect_vm(void) {
          * -> Third try to detect from dmi. */
 
         dmi = detect_vm_dmi();
-        if (dmi == VIRTUALIZATION_ORACLE)
-                return dmi;
+        if (dmi == VIRTUALIZATION_ORACLE) {
+                r = dmi;
+                goto finish;
+        }
 
         r = detect_vm_cpuid();
         if (r < 0)