Changeset 60933 in vbox

Timestamp:

May 10, 2016 6:50:49 PM (9 years ago)

Author:

vboxsync

Message:

bugref:8087: Additions/x11: support non-root X server: prevent the kernel module from loading if the X server version is less than 1.17.

Location:

trunk/src/VBox/Additions/linux/installer

Files:

• vboxadd-x11.sh (modified) (1 diff)
• vboxadd.sh (modified) (1 diff)

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

@@ -373 +373 @@
             dox11config=""
             ;;
+    esac
+    case "${x_version}" in
+    4.* | 6.* | 7.* | 1.?.* | 1.1[0-6].* )
+        echo "blacklist vboxvideo" > /etc/modprobe.d/blacklist-vboxvideo.conf
+        ;;
+    *)
+        if test -f /etc/modprobe.d/blacklist-vboxvideo.conf; then
+            rm -f /etc/modprobe.d/blacklist-vboxvideo.conf
+            ${MODPROBE} vboxvideo
+        fi
+        ;;
     esac
     test -n "${dox11config}" &&

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

@@ -210 +210 @@
         }
     }
-    # Load the kernel video driver if we can.
-    $MODPROBE vboxvideo > /dev/null 2>&1
 
     # Put the X.Org driver in place.  This is harmless if it is not needed.