Changeset 60286 in vbox

Timestamp:

Apr 1, 2016 10:28:09 AM (9 years ago)

Author:

vboxsync

Message:

bugref:8087: Additions/x11: support non-root X server: make sure that we really load the kernel graphics driver when it is needed and simplify the installer/loader logic slightly.

File:

• trunk/src/VBox/Additions/linux/installer/vboxadd-x11.sh (modified) (1 diff)

trunk/src/VBox/Additions/linux/installer/vboxadd-x11.sh

@@ -368 +368 @@
                 vboxvideo_src=""
             }
-            # Do not install if we can use the kernel driver.
-            case `uname -r` in
-                1.* | 2.* | 3.[0-9].* | 3.10.* ) ;;
-                * ) vboxvideo_src="" ;;
-            esac
             ;;
         * )
             # For anything else, assume kernel drivers.
             dox11config=""
-            $MODPROBE vboxvideo ||
-                echo "Warning: failed to set up the X Window System display integration."
             ;;
     esac
+    if $MODPROBE vboxvideo; then
+        # Do not install if we can use the kernel driver.
+        rm -f "$modules_dir/drivers/vboxvideo_drv.so"
+        vboxvideo_src=""
+        dox11config=""
+    fi
     test -n "${dox11config}" &&
         begin "Installing $xserver_version modules"