Changeset 37088 in vbox for trunk/src/VBox/Installer/linux/debian

Timestamp:

May 13, 2011 9:17:29 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

71740

Message:

Installer/linux: split out udev rule installation in order to share the code among the different Linux installers, added a testcase and fixed a broken rule found by the testcase

Location:

trunk/src/VBox/Installer/linux/debian

Files:

• postinst.in (modified) (2 diffs)
• rules (modified) (1 diff)

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

@@ -17 +17 @@
 #  abort-remove:      (our version): removing this package failed
 #  abort-deconfigure: (our version): error during resolving conflicts
+
+#include installer-utils.sh
 
 LOG="/var/log/vbox-install.log"
@@ -41 +43 @@
 
   # install udev rule (disable with INSTALL_NO_UDEV=1 in /etc/default/virtualbox)
-  if [ -d /etc/udev/rules.d -a "$INSTALL_NO_UDEV" != "1" ]; then
-    udev_call=""
-    udev_app=`which udevadm 2> /dev/null`
-    if [ $? -eq 0 ]; then
-      udev_call="${udev_app} version 2> /dev/null"
-    else
-      udev_app=`which udevinfo 2> /dev/null`
-      if [ $? -eq 0 ]; then
-        udev_call="${udev_app} -V 2> /dev/null"
-      fi
-    fi
-    udev_fix="="
-    if [ "${udev_call}" != "" ]; then
-      udev_out=`${udev_call}`
-      udev_ver=`expr "$udev_out" : '[^0-9]*\([0-9]*\)'`
-      if [ "$udev_ver" = "" -o "$udev_ver" -lt 55 ]; then
-        udev_fix=""
-      fi
-    fi
-    echo "KERNEL=${udev_fix}\"vboxdrv\", NAME=\"vboxdrv\", OWNER=\"root\", GROUP=\"root\", MODE=\"0600\"" \
-      > /etc/udev/rules.d/10-vboxdrv.rules
-    if [ "$INSTALL_NO_GROUP" != "1" ]; then
-        usb_group=vboxusers
-    else
-        usb_group=root
-    fi
-    usb_createnode="/usr/share/virtualbox/VBoxCreateUSBNode.sh"
-    echo "SUBSYSTEM=${udev_fix}\"usb_device\", ACTION=${udev_fix}\"add\", RUN=\"${usb_createnode} \$major \$minor \$attr{bDeviceClass} ${usb_group}\"" \
-        >> /etc/udev/rules.d/10-vboxdrv.rules
-    echo "SUBSYSTEM=${udev_fix}\"usb\", ACTION=${udev_fix}\"add\", ENV{DEVTYPE}==\"usb_device\", RUN=\"${usb_createnode} \$major \$minor \$attr{bDeviceClass} ${usb_group}\"" \
-        >> /etc/udev/rules.d/10-vboxdrv.rules
-    echo "SUBSYSTEM=${udev_fix}\"usb_device\", ACTION=${udev_fix}\"remove\", RUN=\"${usb_createnode} --remove \$major \$minor\"" \
-        >> /etc/udev/rules.d/10-vboxdrv.rules
-    echo "SUBSYSTEM=${udev_fix}\"usb\", ACTION=${udev_fix}\"remove\", ENV{DEVTYPE}==\"usb_device\", RUN=\"${usb_createnode} --remove \$major \$minor\"" \
-        >> /etc/udev/rules.d/10-vboxdrv.rules
+  if [ "$INSTALL_NO_GROUP" != "1" ]; then
+      usb_group=vboxusers
+  else
+      usb_group=root
   fi
-  # Remove old udev description file
-  if [ -f /etc/udev/rules.d/60-vboxdrv.rules ]; then
-      rm -f /etc/udev/rules.d/60-vboxdrv.rules 2> /dev/null
-  fi
+  install_udev_package ${usb_group} > /etc/udev/rules.d/10-vboxdrv.rules
   # Build our device tree
   for i in /sys/bus/usb/devices/*; do

trunk/src/VBox/Installer/linux/debian/rules

@@ -340 +340 @@
         cat debian/preinst.in | sed -e 's|%VER%|$(ver)|g' > debian/preinst
         cat debian/prerm.in | sed -e 's|%VER%|$(ver)|g' > debian/prerm
-        cat debian/postinst.in | sed -e 's|%VER%|$(ver)|g' > debian/postinst
+        cat debian/postinst.in | \
+            sed -e 's|%VER%|$(ver)|g' \
+            -e '/#include installer-utils.sh/ {' \
+            -e "r $(vboxroot)/src/VBox/Installer/linux/installer-utils.sh" \
+            -e 'd' \
+            -e '}' \
+            > debian/postinst
         dh_installdebconf
         dh_installchangelogs