Changeset 37123 in vbox

Timestamp:

May 17, 2011 11:14:50 AM (14 years ago)

Author:

vboxsync

Message:

Installer/linux: correct udev RUN rule and only install rules for USB with recent udev

Location:

trunk/src/VBox/Installer/linux

Files:

• installer-utils.sh (modified) (3 diffs)
• testcase/tstInstallerLinux.sh (modified) (5 diffs)

trunk/src/VBox/Installer/linux/installer-utils.sh

@@ -44 +44 @@
     USB_GROUP="$2"
 
-    echo "SUBSYSTEM==\"usb_device\", ACTION==\"add\", RUN=\"$INSTALLATION_DIR/VBoxCreateUSBNode.sh \$major \$minor \$attr{bDeviceClass}${USB_GROUP}\""
-    echo "SUBSYSTEM==\"usb\", ACTION==\"add\", ENV{DEVTYPE}==\"usb_device\", RUN=\"$INSTALLATION_DIR/VBoxCreateUSBNode.sh \$major \$minor \$attr{bDeviceClass}${USB_GROUP}\""
-    echo "SUBSYSTEM==\"usb_device\", ACTION==\"remove\", RUN=\"$INSTALLATION_DIR/VBoxCreateUSBNode.sh --remove \$major \$minor\""
-    echo "SUBSYSTEM==\"usb\", ACTION==\"remove\", ENV{DEVTYPE}==\"usb_device\", RUN=\"$INSTALLATION_DIR/VBoxCreateUSBNode.sh --remove \$major \$minor\""
+    echo "SUBSYSTEM==\"usb_device\", ACTION==\"add\", RUN+=\"$INSTALLATION_DIR/VBoxCreateUSBNode.sh \$major \$minor \$attr{bDeviceClass}${USB_GROUP}\""
+    echo "SUBSYSTEM==\"usb\", ACTION==\"add\", ENV{DEVTYPE}==\"usb_device\", RUN+=\"$INSTALLATION_DIR/VBoxCreateUSBNode.sh \$major \$minor \$attr{bDeviceClass}${USB_GROUP}\""
+    echo "SUBSYSTEM==\"usb_device\", ACTION==\"remove\", RUN+=\"$INSTALLATION_DIR/VBoxCreateUSBNode.sh --remove \$major \$minor\""
+    echo "SUBSYSTEM==\"usb\", ACTION==\"remove\", ENV{DEVTYPE}==\"usb_device\", RUN+=\"$INSTALLATION_DIR/VBoxCreateUSBNode.sh --remove \$major \$minor\""
 }
 
@@ -81 +81 @@
                     udev_fix="1"
                 fi
+                udev_do_usb=""
+                if [ "$udev_ver" -ge 59 ]; then
+                    udev_do_usb="1"
+                fi
             fi
             case "$udev_fix" in
@@ -86 +90 @@
                 udev_write_vboxdrv "$VBOXDRV_GRP" "$VBOXDRV_MODE" |
                     sed 's/\([^+=]*\)[+=]*\([^"]*"[^"]*"\)/\1=\2/g'
-                udev_write_usb "$INSTALLATION_DIR" "$USB_GROUP" |
-                    sed 's/\([^+=]*\)[+=]*\([^"]*"[^"]*"\)/\1=\2/g'
                 ;;
             *)
                 udev_write_vboxdrv "$VBOXDRV_GRP" "$VBOXDRV_MODE"
-                udev_write_usb "$INSTALLATION_DIR" "$USB_GROUP"
+                case "$udev_do_usb" in "1")
+                    udev_write_usb "$INSTALLATION_DIR" "$USB_GROUP" ;;
+                esac
                 ;;
             esac

trunk/src/VBox/Installer/linux/testcase/tstInstallerLinux.sh

@@ -22 +22 @@
 echo "Testing udev rule generation for the \".run\" installer"
 
+setup_test_input_install_udev ".run, udev-59" 59
+
+udev_59_rules=`cat <<'UDEV_END'
+KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="vboxusers", MODE="0660"
+SUBSYSTEM=="usb_device", ACTION=="add", RUN+="/opt/VirtualBox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
+SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN+="/opt/VirtualBox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
+SUBSYSTEM=="usb_device", ACTION=="remove", RUN+="/opt/VirtualBox/VBoxCreateUSBNode.sh --remove $major $minor"
+SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN+="/opt/VirtualBox/VBoxCreateUSBNode.sh --remove $major $minor"
+UDEV_END`
+
+install_udev_output="`install_udev_run vboxusers 0660 /opt/VirtualBox`"
+case "$install_udev_output" in
+    "$udev_59_rules") ;;
+    *)
+        echo "Bad output for udev version 59.  Expected:"
+        echo "$udev_59_rules"
+        echo "Actual:"
+        echo "$install_udev_output"
+        CERRS="`expr "$CERRS" + 1`"
+        ;;
+esac
+
+cleanup_test_input_install_udev
+
 setup_test_input_install_udev ".run, udev-55" 55
 
 udev_55_rules=`cat <<'UDEV_END'
 KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="vboxusers", MODE="0660"
-SUBSYSTEM=="usb_device", ACTION=="add", RUN="/opt/VirtualBox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
-SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN="/opt/VirtualBox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
-SUBSYSTEM=="usb_device", ACTION=="remove", RUN="/opt/VirtualBox/VBoxCreateUSBNode.sh --remove $major $minor"
-SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN="/opt/VirtualBox/VBoxCreateUSBNode.sh --remove $major $minor"
 UDEV_END`
 
@@ -50 +70 @@
 udev_54_rules=`cat <<'UDEV_END'
 KERNEL="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0600"
-SUBSYSTEM="usb_device", ACTION="add", RUN="/usr/lib/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
-SUBSYSTEM="usb", ACTION="add", ENV{DEVTYPE}="usb_device", RUN="/usr/lib/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass}"
-SUBSYSTEM="usb_device", ACTION="remove", RUN="/usr/lib/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
-SUBSYSTEM="usb", ACTION="remove", ENV{DEVTYPE}="usb_device", RUN="/usr/lib/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
 UDEV_END`
 
@@ -68 +84 @@
 esac
 
+cleanup_test_input_install_udev
+
 echo "Testing udev rule generation for the \"package\" installer"
+
+setup_test_input_install_udev "package, udev-59" 59
+
+udev_59_rules=`cat <<'UDEV_END'
+KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0600"
+SUBSYSTEM=="usb_device", ACTION=="add", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers"
+SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers"
+SUBSYSTEM=="usb_device", ACTION=="remove", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
+SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN+="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
+UDEV_END`
+
+install_udev_output="`install_udev_package vboxusers`"
+case "$install_udev_output" in
+    "$udev_59_rules") ;;
+    *)
+        echo "Bad output for udev version 59.  Expected:"
+        echo "$udev_59_rules"
+        echo "Actual:"
+        echo "$install_udev_output"
+        CERRS="`expr "$CERRS" + 1`"
+        ;;
+esac
 
 cleanup_test_input_install_udev
@@ -76 +116 @@
 udev_55_rules=`cat <<'UDEV_END'
 KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0600"
-SUBSYSTEM=="usb_device", ACTION=="add", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers"
-SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers"
-SUBSYSTEM=="usb_device", ACTION=="remove", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
-SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
 UDEV_END`
 
@@ -100 +136 @@
 udev_54_rules=`cat <<'UDEV_END'
 KERNEL="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0600"
-SUBSYSTEM="usb_device", ACTION="add", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} root"
-SUBSYSTEM="usb", ACTION="add", ENV{DEVTYPE}="usb_device", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} root"
-SUBSYSTEM="usb_device", ACTION="remove", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
-SUBSYSTEM="usb", ACTION="remove", ENV{DEVTYPE}="usb_device", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
 UDEV_END`