Index: /trunk/src/VBox/Installer/linux/vboxdrv.sh
===================================================================
--- /trunk/src/VBox/Installer/linux/vboxdrv.sh	(revision 58270)
+++ /trunk/src/VBox/Installer/linux/vboxdrv.sh	(revision 58271)
@@ -68,4 +68,14 @@
     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
@@ -103,4 +113,7 @@
     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.
@@ -230,4 +243,9 @@
 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.
@@ -242,13 +260,7 @@
     fi
     if ! running vboxdrv; then
-        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
+        rm -f $DEVICE || failure "Cannot remove $DEVICE"
+        $MODPROBE vboxdrv > /dev/null 2>&1 || \
+            failure "modprobe vboxdrv failed. Please use 'dmesg' to find out why"
         sleep .2
     fi