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

Timestamp:

Oct 22, 2018 8:57:20 AM (6 years ago)

Author:

vboxsync

Message:

Additions/linux/installer: try to inhibit reboot while rebuilding initramfs.
bugref:4567: Linux kernel driver maintenance
Since we have started doing initramfs rebuilds again, and in particular since
with the last change they can happen with a delay after a new kernel is
installed, try to inhibit reboots during the rebuild process. Hopefully the
rebuild process is designed so that that is not a problem, but better safe(r)
than sorry. Also try rebuilding kernel modules once a minute to start with,
not once every five minutes, after the new kernel is installed.

File:

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

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

@@ -329 +329 @@
         test -f "/lib/modules/${version}/misc/vboxvideo.ko" &&
         touch "/lib/modules/${version}/initrd/vboxvideo"
+
+    # Systems without systemd-inhibit probably don't need their initramfs
+    # rebuild here anyway.
+    type systemd-inhibit >/dev/null 2>&1 || return
     if type dracut >/dev/null 2>&1; then
-        dracut -f --kver "${version}"
+        systemd-inhibit --why="Installing VirtualBox Guest Additions" \
+            dracut -f --kver "${version}"
     elif type update-initramfs >/dev/null 2>&1; then
-        update-initramfs -u -k "${version}"
+        systemd-inhibit --why="Installing VirtualBox Guest Additions" \
+            update-initramfs -u -k "${version}"
     fi
 }
@@ -383 +389 @@
     # installed.  Package managers have been known to trigger module rebuilds
     # before actually installing the headers.
-    for count in 1 2 3 4 5; do
+    for delay in 60 60 60 60 60 300 30 300 300; 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
+        printf "Kernel modules not yet installed, waiting %s seconds." "${delay}"
+        sleep "${delay}"
     done
 
+    # Inhibit shutdown for up to ten minutes if possible.
+    systemd-inhibit 600 2>/dev/null &
     log "Building the main Guest Additions module."
     if ! myerr=`$BUILDINTMP \
@@ -399 +407 @@
         "${INSTALL_DIR}"/other/check_module_dependencies.sh 2>&1 &&
             info "Look at $LOG to find out what went wrong"
-        update_initramfs "${KERN_VER}"
+        kill $! 2>/dev/null
         return 0
     fi
@@ -409 +417 @@
         module_build_log "$myerr"
         info  "Look at $LOG to find out what went wrong"
-        update_initramfs "${KERN_VER}"
+        kill $! 2>/dev/null
         return 0
     fi
@@ -426 +434 @@
     update_initramfs "${KERN_VER}"
     depmod
+    kill $! 2>/dev/null
     return 0
 }