Changeset 36417 in vbox

Timestamp:

Mar 24, 2011 10:49:51 PM (14 years ago)

Author:

vboxsync

Message:

Installer/Linux and Main: USB enumeration: fix detection of USB via sysfs/usb_device

Location:

trunk/src/VBox

Files:

• Installer/linux/vboxdrv.sh.in (modified) (1 diff)
• Main/src-server/linux/USBGetDevices.cpp (modified) (1 diff)

trunk/src/VBox/Installer/linux/vboxdrv.sh.in

@@ -205 +205 @@
     if ! $MODPROBE vboxnetadp > /dev/null 2>&1; then
         failure "modprobe vboxnetadp failed. Please use 'dmesg' to find out why"
+    fi
+    # Create the /dev/vboxusb directory if the host supports that method
+    # of USB access.  The USB code checks for the existance of that path.
+    if grep -q usb_device /proc/devices; then
+        mkdir -p -m 0640 /dev/vboxusb 2>/dev/null
+        chown root:vboxusers /dev/vboxusb 2>/dev/null
     fi
     succ_msg

trunk/src/VBox/Main/src-server/linux/USBGetDevices.cpp

@@ -1443 +1443 @@
                 && !pcBestSysfs
                 && RTPathExists(s_aTreeLocations[i].szDevicesRoot))
-            {
-                PUSBDEVICE pDevices;
-
-                pDevices = getDevicesFromSysfs(s_aTreeLocations[i].szDevicesRoot,
-                                               true);
-                if (pDevices)
-                {
-                    pcBestSysfs = &s_aTreeLocations[i];
-                    deviceListFree(&pDevices);
-                }
-            }
+                pcBestSysfs = &s_aTreeLocations[i];
         }
     if (pcBestUsbfs && !fPreferSysfs)