Changeset 38423 in vbox for trunk/src/VBox/Installer

Timestamp:

Aug 11, 2011 4:59:14 PM (14 years ago)

Author:

vboxsync

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

73466

Message:

Installer/linux/rpm, deb: share udev and device node installation between installers, and create the vboxusers group before we do that installation

Location:

trunk/src/VBox/Installer/linux

Files:

• debian/postinst.in (modified) (2 diffs)
• rpm/VirtualBox.tmpl.spec (modified) (2 diffs)

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

@@ -42 +42 @@
   fi
 
-  # install udev rule (disable with INSTALL_NO_UDEV=1 in /etc/default/virtualbox)
-  if [ "$INSTALL_NO_GROUP" != "1" ]; then
-      usb_group=vboxusers
-  else
-      usb_group=root
-  fi
-  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
-    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 ${usb_createnode} "$major" "$minor" "$class" ${usb_group} 2>/dev/null
-    fi
-  done
-
   # create users groups (disable with INSTALL_NO_GROUP=1 in /etc/default/virtualbox)
   if [ "$INSTALL_NO_GROUP" != "1" ]; then
@@ -67 +48 @@
     addgroup --system vboxusers || true
   fi
+
+  # install udev rule (disable with INSTALL_NO_UDEV=1 in
+  # /etc/default/virtualbox) and /dev/vboxdrv and /dev/vboxusb/*/* device nodes
+  install_device_node_setup root 0600 /usr/share/virtualbox "${usb_group}"
 
   # The starters need to be Suid root. They drop the privileges before starting

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

@@ -237 +237 @@
 rm -f /etc/vbox/module_not_compiled
 
-# install udev rule (disable with INSTALL_NO_UDEV=1 in /etc/default/virtualbox)
-install_udev root 0600 /usr/share/virtualbox vboxusers "$INSTALL_NO_UDEV" \
-             > /etc/udev/rules.d/10-vboxdrv.rules
-
-# 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 ${usb_createnode} "$major" "$minor" "$class" ${usb_group} 2>/dev/null
-  fi
-done
-
 # XXX SELinux: allow text relocation entries
 %if %{?rpm_redhat:1}%{!?rpm_redhat:0}
@@ -275 +260 @@
   groupadd -f vboxusers 2> /dev/null
 fi
+
+# install udev rule (disable with INSTALL_NO_UDEV=1 in /etc/default/virtualbox)
+# and /dev/vboxdrv and /dev/vboxusb/*/* device nodes
+install_device_node_setup root 0600 /usr/share/virtualbox "${usb_group}"
 %if %{?rpm_redhat:1}%{!?rpm_redhat:0}
 /sbin/chkconfig --add vboxdrv