Changeset 67852 in vbox for trunk/src/VBox/Additions/linux

Timestamp:

Jul 7, 2017 1:34:33 PM (7 years ago)

Author:

vboxsync

Message:

bugref:8906: Additions/linux: kernel modules not always rebuild before reboot on Fedora kernel upgrade
Make sure vboxvideo is loaded when it is rebuilt at boot time.

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. So load it
unconditionally if it is not blacklisted.

File:

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

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

@@ -346 +346 @@
     if test -n "${blacklist_vboxvideo}"; then
         echo "blacklist vboxvideo" > /etc/modprobe.d/blacklist-vboxvideo.conf
-    elif test -f /etc/modprobe.d/blacklist-vboxvideo.conf; then
-        rm -f /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