Changeset 26618 in vbox for trunk/src/VBox/Runtime/r3

Timestamp:

Feb 17, 2010 3:59:18 PM (15 years ago)

Author:

vboxsync

Message:

RTSystemQueryDmiString-linux.cpp: the dmi stuff can be in /sys/devices/virtual/dmi as well as /sys/class/dmi it seems, so check both places.

File:

• trunk/src/VBox/Runtime/r3/linux/RTSystemQueryDmiString-linux.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/r3/linux/RTSystemQueryDmiString-linux.cpp

@@ -53 +53 @@
     switch (enmString)
     {
-        case RTSYSDMISTR_PRODUCT_NAME:      pszSysFsName = "devices/virtual/dmi/id/product_name"; break;
-        case RTSYSDMISTR_PRODUCT_VERSION:   pszSysFsName = "devices/virtual/dmi/id/product_version"; break;
-        case RTSYSDMISTR_PRODUCT_UUID:      pszSysFsName = "devices/virtual/dmi/id/product_uuid"; break;
-        case RTSYSDMISTR_PRODUCT_SERIAL:    pszSysFsName = "devices/virtual/dmi/id/product_serial"; break;
+        case RTSYSDMISTR_PRODUCT_NAME:      pszSysFsName = "id/product_name"; break;
+        case RTSYSDMISTR_PRODUCT_VERSION:   pszSysFsName = "id/product_version"; break;
+        case RTSYSDMISTR_PRODUCT_UUID:      pszSysFsName = "id/product_uuid"; break;
+        case RTSYSDMISTR_PRODUCT_SERIAL:    pszSysFsName = "id/product_serial"; break;
         default:
             return VERR_NOT_SUPPORTED;
@@ -62 +62 @@
 
     int rc;
-    int fd = RTLinuxSysFsOpen(pszSysFsName);
+    int fd = RTLinuxSysFsOpen("devices/virtual/dmi/%s", pszSysFsName);
+    if (fd < 0)
+        fd = RTLinuxSysFsOpen("class/dmi/%s", pszSysFsName);
     if (fd >= 0)
     {