Changeset 60105 in vbox for trunk/src

Timestamp:

Mar 18, 2016 7:43:15 PM (9 years ago)

Author:

vboxsync

Message:

bugref:8087: Additions/x11: support non-root X server: install user space vboxvideo drivers for server 1.17 and 1.18 too, but only install the driver exactly when we do not support the current kernel version. Since this is re-done on every boot we can cope with kernel version changes.

File:

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

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

@@ -357 +357 @@
             esac
             ;;
-        1.12.* | 1.13.* | 1.14.* | 1.15.* | 1.16.* )
+        1.12.* | 1.13.* | 1.14.* | 1.15.* | 1.16.* | 1.17.* | 1.18.* )
             xserver_version="X.Org Server ${x_version_short}"
             vboxvideo_src=vboxvideo_drv_`echo ${x_version_short} | sed 's/\.//'`.so
@@ -368 +368 @@
                 vboxvideo_src=""
             }
+            # Do not install if we can use the kernel driver.
+            case `uname -r` in
+                1.* | 2.* | 3.[0-9].* | 3.11 ) ;;
+                * ) vboxvideo_src="" ;;
+            esac
             ;;
         * )