installer

Timestamp:

Jun 28, 2017 9:01:05 AM (8 years ago)

Author:

vboxsync

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

116440

Message:

Additions/linux: bugref:8869: blacklist the vboxvideo kernel module for OL6

File:

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

-              r64525
+              r67658
 # Version of Redhat or Fedora installed.  Needed for setting up selinux policy.
 redhat_release=`cat /etc/redhat-release 2> /dev/null`
+# Version of OL installed.  Needed for blacklisting vboxvideo.
+oracle_release=`cat /etc/oracle-release 2> /dev/null`
 # All the different possible locations for XFree86/X.Org configuration files
 # - how many of these have ever been used?
 …
     case "${x_version}" in
 .* | 6.* | 7.* | 1.?.* | 1.1[0-6].* )
         echo "blacklist vboxvideo" > /etc/modprobe.d/blacklist-vboxvideo.conf
+        blacklist_vboxvideo="yes"
         ;;
     *)
 …
         ;;
     esac
+    case "$oracle_release" in
+        Oracle*release\ 6.* )
+            # relevant for OL6/UEK4 but cannot hurt for other kernels
+            blacklist_vboxvideo="yes"
+            ;;
+    esac
+    test -n "${blacklist_vboxvideo}" &&
+        echo "blacklist vboxvideo" > /etc/modprobe.d/blacklist-vboxvideo.conf
     test -n "${dox11config}" &&
         echo "Installing $xserver_version modules" >&2

Note: See TracChangeset for help on using the changeset viewer.