Changeset 74891 in vbox for trunk

Timestamp:

Oct 17, 2018 5:37:49 PM (6 years ago)

Author:

vboxsync

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

125883

Message:

Additions/linux/installer: fix rebuilding modules for new kernels.
bugref:4567: Linux kernel driver maintenance
Red Hat derived distributions have been known, when upgrading kernel
packages, to call kernel module rebuild scripts before installing the
headers needed for the rebuild. So our rebuild script now waits in the
background for a while if the headers are not there.

File:

• trunk/src/VBox/Additions/linux/installer/vboxadd.sh (modified) (3 diffs)

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

@@ -224 +224 @@
     begin "Starting."
     # If we got this far assume that the slow set-up has been done.
-    QUICKSETUP=yes
+    QUICKSETUP=start
     if test -z "${INSTALL_NO_MODULE_BUILDS}"; then
         uname -r | grep -q -E '^2\.6|^3|^4' 2>/dev/null &&
@@ -380 +380 @@
     info "Building the VirtualBox Guest Additions kernel modules.  This may take a while."
 
+    # If the kernel headers are not there, wait at bit in case they get
+    # installed.  Package managers have been known to trigger module rebuilds
+    # before actually installing the headers.
+    for count in 1 2 3 4 5; do
+        test "x${QUICKSETUP}" = xyes || break
+        test -d "/lib/modules/${KERN_VER}/build" && break
+        printf "Kernel modules not yet installed, waiting five minutes (%s of 5)" "${count}"
+        sleep 300
+    done
+
     log "Building the main Guest Additions module."
     if ! myerr=`$BUILDINTMP \
@@ -464 +474 @@
     cat << EOF > /etc/kernel/postinst.d/vboxadd
 #!/bin/sh
-test -d "/lib/modules/\${1}/build" || exit 0
-KERN_VER="\${1}" /sbin/rcvboxadd quicksetup
+# Run in the background so that we can wait in case the package installer has
+# not yet installed the kernel headers we need.
+KERN_VER="\${1}" /sbin/rcvboxadd quicksetup &
 exit 0
 EOF