Changeset 67858 in vbox

Timestamp:

Jul 7, 2017 3:24:25 PM (8 years ago)

Author:

vboxsync

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

116814

Message:

bugref:8906: Additions/linux: kernel modules not always rebuild before reboot on Fedora kernel upgrade
Load vboxvideo when it is rebuilt at boot time even on guests without Xorg.

Our Additions boot scripts load vboxvideo manually if it was previously
blacklisted. However, there is another case when it might not be loaded
automatically: when it has just been built at boot time and Xorg is not.
installed on the guest. Fix that.

File:

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

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

@@ -206 +206 @@
     fi
 
+    case "${x_version}" in
+    4.* | 6.* | 7.* | 1.?.* | 1.1[0-6].* )
+        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
+    if test -n "${blacklist_vboxvideo}"; then
+        echo "blacklist vboxvideo" > /etc/modprobe.d/blacklist-vboxvideo.conf
+    else
+        test -f /etc/modprobe.d/blacklist-vboxvideo.conf &&
+            rm -f /etc/modprobe.d/blacklist-vboxvideo.conf
+        # We do not want to load the driver if X.Org Server is already
+        # running, as without a driver the server will touch the hardware
+        # directly, causing problems.
+        ps -Af | grep -q '[X]org' || ${MODPROBE} -q vboxvideo
+    fi
+
     test -z "$x_version" -o -z "$modules_dir" &&
         {
@@ -334 +355 @@
             ;;
     esac
-    case "${x_version}" in
-    4.* | 6.* | 7.* | 1.?.* | 1.1[0-6].* )
-        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
-    if test -n "${blacklist_vboxvideo}"; then
-        echo "blacklist vboxvideo" > /etc/modprobe.d/blacklist-vboxvideo.conf
-    else
-        test -f /etc/modprobe.d/blacklist-vboxvideo.conf &&
-            rm -f /etc/modprobe.d/blacklist-vboxvideo.conf
-        # We do not want to load the driver if X.Org Server is already
-        # running, as without a driver the server will touch the hardware
-        # directly, causing problems.
-        ps -Af | grep -q '[X]org' || ${MODPROBE} vboxvideo
-    fi
     test -n "${dox11config}" &&
         echo "Installing $xserver_version modules" >&2