Changeset 61827 in vbox

Timestamp:

Jun 22, 2016 6:36:31 PM (9 years ago)

Author:

vboxsync

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

108234

Message:

bugref:8051: Installers: unify Linux host installers as far as possible: revert r103461: check the version and support driver version of currently installed kernel modules. We can get the same result for normal users with simpler code by always deleting old modules during installation. Developers can deal with making sure the right version is loaded.

File:

• trunk/src/VBox/Installer/linux/vboxdrv.sh (modified) (4 diffs)

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

@@ -70 +70 @@
     DEVICE_MODE=0660
 fi
-VERSION=`cat "${MODULE_SRC}/vboxdrv/version-generated.h" \
-       | sed -n 's/#define\s*VBOX_VERSION_STRING\s*"\(.*\)"/\1/p'`
-IOC_VERSION=`cat "${MODULE_SRC}/vboxdrv/SUPDrvIOC.h" \
-           | sed -n 's/#define\s*SUPDRV_IOC_VERSION\s*\(.*\)/\1/p'`
-MODINFO_VERSION=`modinfo vboxdrv 2>/dev/null | grep "^version:"`
-if expr "${MODINFO_VERSION}" : ".*${IOC_VERSION}" > /dev/null; then
-    MODULE_BUILT=yes
-else
-    MODULE_BUILT=
-fi
 
 [ -r /etc/default/virtualbox ] && . /etc/default/virtualbox
@@ -115 +105 @@
     lsmod | grep -q "$1[^_-]"
 }
-
-test -z "${MODINFO_VERSION}" || expr "${MODINFO_VERSION}" : ".*${VERSION}" > /dev/null || \
-    failure "Different version of VirtualBox services running. Please uninstall and try again"
 
 ## Output the vboxdrv part of our udev rule.  This is redirected to the right file.
@@ -245 +232 @@
 start()
 {
-    if test -z "${MODULE_BUILT}"; then
-        test -z "${MODINFO_VERSION}" || stop || \
-            failure "Cannot stop incompatible services version"
-        setup
-    fi
     begin_msg "Starting VirtualBox services" console
     # Create udev rule and USB device nodes.
@@ -262 +244 @@
     fi
     if ! running vboxdrv; then
-        rm -f $DEVICE || failure "Cannot remove $DEVICE"
-        $MODPROBE vboxdrv > /dev/null 2>&1 || \
-            failure "modprobe vboxdrv failed. Please use 'dmesg' to find out why"
+        if ! rm -f $DEVICE; then
+            failure "Cannot remove $DEVICE"
+        fi
+        if ! $MODPROBE vboxdrv > /dev/null 2>&1; then
+            setup
+            if ! $MODPROBE vboxdrv > /dev/null 2>&1; then
+                failure "modprobe vboxdrv failed. Please use 'dmesg' to find out why"
+            fi
+        fi
         sleep .2
     fi