Changeset 34456 in vbox for trunk/src/VBox

Timestamp:

Nov 29, 2010 12:20:42 PM (14 years ago)

Author:

vboxsync

Message:

Main/linux/USB and Installer/linux: switch to using our own device tree under /dev

Location:

trunk/src/VBox

Files:

• Installer/linux/Makefile.kmk (modified) (2 diffs)
• Installer/linux/VBoxCreateUSBNode.sh (added)
• Installer/linux/install.sh (modified) (2 diffs)
• Main/linux/USBGetDevices.cpp (modified) (1 diff)

trunk/src/VBox/Installer/linux/Makefile.kmk

@@ -66 +66 @@
 linux-bin_SOURCES = \
         VBoxSysInfo.sh \
+        VBoxCreateUSBNode.sh \
         VBox.sh=>VBox.sh \
         $(if $(VBOX_WITH_PYTHON),$(PATH_ROOT)/src/VBox/Frontends/VBoxShell/vboxshell.py=>vboxshell.py,)
@@ -145 +146 @@
         $(if $(VBOX_WITH_PYTHON),vboxshell.py,) \
         VBoxSysInfo.sh \
+        VBoxCreateUSBNode.sh \
         VBox.sh \
         VBox.png

trunk/src/VBox/Installer/linux/install.sh

@@ -423 +423 @@
         echo "KERNEL=${udev_fix}\"vboxdrv\", NAME=\"vboxdrv\", OWNER=\"root\", GROUP=\"$VBOXDRV_GRP\", MODE=\"$VBOXDRV_MODE\"" \
           > /etc/udev/rules.d/10-vboxdrv.rules
-        echo "SUBSYSTEM=${udev_fix}\"usb_device\", GROUP=\"$VBOXUSB_GRP\", MODE=\"$VBOXUSB_MODE\"" \
+        echo "SUBSYSTEM=${udev_fix}\"usb_device\", ACTION=${udev_fix}\"add\", RUN=\"$INSTALLATION_DIR/VBoxCreateUSBNode.sh \$major \$minor \$attr{bDeviceClass}\"" \
           >> /etc/udev/rules.d/10-vboxdrv.rules
-        echo "SUBSYSTEM=${udev_fix}\"usb\", ENV{DEVTYPE}==\"usb_device\", GROUP=\"$VBOXUSB_GRP\", MODE=\"$VBOXUSB_MODE\"" \
+        echo "SUBSYSTEM=${udev_fix}\"usb\", ACTION=${udev_fix}\"add\", ENV{DEVTYPE}==\"usb_device\", RUN=\"$INSTALLATION_DIR/VBoxCreateUSBNode.sh \$major \$minor \$attr{bDeviceClass}\"" \
+          >> /etc/udev/rules.d/10-vboxdrv.rules
+        echo "SUBSYSTEM=${udev_fix}\"usb_device\", ACTION=${udev_fix}\"remove\", RUN=\"$INSTALLATION_DIR/VBoxCreateUSBNode.sh --remove \$major \$minor\"" \
+          >> /etc/udev/rules.d/10-vboxdrv.rules
+        echo "SUBSYSTEM=${udev_fix}\"usb\", ACTION=${udev_fix}\"remove\", ENV{DEVTYPE}==\"usb_device\", RUN=\"$INSTALLATION_DIR/VBoxCreateUSBNode.sh --remove \$major \$minor\"" \
           >> /etc/udev/rules.d/10-vboxdrv.rules
     fi
@@ -433 +437 @@
     fi
 
-    # Push the permissions to the USB device nodes.  One of these should match.
-    # Rather nasty to use udevadm trigger for this, but I don't know of any
-    # better way.
-    udevadm trigger --subsystem-match=usb > /dev/null 2>&1
-    udevtrigger --subsystem-match=usb > /dev/null 2>&1
-    udevtrigger --subsystem-match=usb_device > /dev/null 2>&1
-    udevplug -Busb > /dev/null 2>&1
+    # Build our device tree
+    for i in /sys/bus/usb/devices/*; do
+        if test -r "$i/dev"; then
+            dev="`cat "$i/dev" 2> /dev/null`"
+            major="`expr "$dev" : '\(.*\):' 2> /dev/null`"
+            minor="`expr "$dev" : '.*:\(.*\)' 2> /dev/null`"
+            class="`cat $i/bDeviceClass 2> /dev/null`"
+            sh "$INSTALLATION_DIR/VBoxCreateUSBNode.sh" "$major" "$minor" "$class" 2>/dev/null
+        fi
+    done
 
     # Write the configuration. Do this before we call /etc/init.d/vboxdrv setup!

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

@@ -101 +101 @@
     { "/proc/bus/usb", false },
     { "/dev/bus/usb",  false },
+    { "/dev/vboxusb",  true },
     { "/dev/bus/usb",  true },
 };