Changeset 37124 in vbox

Timestamp:

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

Author:

vboxsync

Message:

Installer/linux: refactored udev rule installation

Location:

trunk/src/VBox/Installer/linux

Files:

• debian/postinst.in (modified) (1 diff)
• install.sh (modified) (1 diff)
• installer-utils.sh (modified) (2 diffs)
• rpm/VirtualBox.tmpl.spec (modified) (1 diff)
• testcase/tstInstallerLinux.sh (modified) (5 diffs)

trunk/src/VBox/Installer/linux/debian/postinst.in

@@ -48 +48 @@
       usb_group=root
   fi
-  install_udev_package ${usb_group} > /etc/udev/rules.d/10-vboxdrv.rules
+  install_udev root 0600 /usr/share/virtualbox "${usb_group}" \
+               "$INSTALL_NO_UDEV" > /etc/udev/rules.d/10-vboxdrv.rules
   # Build our device tree
   for i in /sys/bus/usb/devices/*; do

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

@@ -443 +443 @@
 
     # Create udev description file
-    install_udev_run "$VBOXDRV_GRP" "$VBOXDRV_MODE" "$INSTALLATION_DIR" \
+    install_udev "$VBOXDRV_GRP" "$VBOXDRV_MODE" "$INSTALLATION_DIR" \
         > /etc/udev/rules.d/10-vboxdrv.rules
 

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

@@ -50 +50 @@
 }
 
-install_udev_run() {
+install_udev() {
     # install udev rule (disable with INSTALL_NO_UDEV=1 in /etc/default/virtualbox) for distribution packages
     VBOXDRV_GRP="$1"      # The group owning the vboxdrv device
@@ -113 +113 @@
     DELETED_UDEV_FILE=""
 }
-
-install_udev_package() {
-    # install udev rule (disable with INSTALL_NO_UDEV=1 in /etc/default/virtualbox) for distribution packages
-    usb_group=$1
-    install_udev_run root 0600 /usr/share/virtualbox "${usb_group}" \
-                     "$INSTALL_NO_UDEV"
-}

trunk/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec

@@ -238 +238 @@
 
 # install udev rule (disable with INSTALL_NO_UDEV=1 in /etc/default/virtualbox)
-install_udev_package vboxusers > /etc/udev/rules.d/10-vboxdrv.rules
+install_udev root 0600 /usr/share/virtualbox vboxusers "$INSTALL_NO_UDEV" \
+             > /etc/udev/rules.d/10-vboxdrv.rules
 
 # Build our device tree

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

@@ -20 +20 @@
 CERRS=0
 
-echo "Testing udev rule generation for the \".run\" installer"
+echo "Testing udev rule generation"
 
 setup_test_input_install_udev ".run, udev-59" 59
@@ -32 +32 @@
 UDEV_END`
 
-install_udev_output="`install_udev_run vboxusers 0660 /opt/VirtualBox`"
+install_udev_output="`install_udev vboxusers 0660 /opt/VirtualBox`"
 case "$install_udev_output" in
     "$udev_59_rules") ;;
@@ -52 +52 @@
 UDEV_END`
 
-install_udev_output="`install_udev_run vboxusers 0660 /opt/VirtualBox`"
+install_udev_output="`install_udev vboxusers 0660 /opt/VirtualBox`"
 case "$install_udev_output" in
     "$udev_55_rules") ;;
@@ -72 +72 @@
 UDEV_END`
 
-install_udev_output="`install_udev_run root 0600 /usr/lib/virtualbox`"
+install_udev_output="`install_udev root 0600 /usr/lib/virtualbox`"
 case "$install_udev_output" in
     "$udev_54_rules") ;;
@@ -86 +86 @@
 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
-
-setup_test_input_install_udev "package, udev-55" 55
-
-udev_55_rules=`cat <<'UDEV_END'
-KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0600"
-UDEV_END`
-
-install_udev_output="`install_udev_package vboxusers`"
-case "$install_udev_output" in
-    "$udev_55_rules") ;;
-    *)
-        echo "Bad output for udev version 55.  Expected:"
-        echo "$udev_55_rules"
-        echo "Actual:"
-        echo "$install_udev_output"
-        CERRS="`expr "$CERRS" + 1`"
-        ;;
-esac
-
-cleanup_test_input_install_udev
-
-setup_test_input_install_udev "package, udev-54" 54
-
-udev_54_rules=`cat <<'UDEV_END'
-KERNEL="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0600"
-UDEV_END`
-
-install_udev_output="`install_udev_package root`"
-case "$install_udev_output" in
-    "$udev_54_rules") ;;
-    *)
-        echo "Bad output for udev version 54.  Expected:"
-        echo "$udev_54_rules"
-        echo "Actual:"
-        echo "$install_udev_output"
-        CERRS="`expr "$CERRS" + 1`"
-        ;;
-esac
-
-cleanup_test_input_install_udev
-
-setup_test_input_install_udev "package, no udev" 54
-INSTALL_NO_UDEV=1
-
-install_udev_output="`install_udev_package root`"
-case "$install_udev_output" in
-    "") ;;
-    *)
-        echo "Bad output for udev version 54.  Expected:"
-        echo "$udev_54_rules"
-        echo "Actual:"
-        echo "$install_udev_output"
-        CERRS="`expr "$CERRS" + 1`"
-        ;;
-esac
-
-cleanup_test_input_install_udev
-INSTALL_NO_UDEV=
-
 echo "Done.  Error count $CERRS."