Changeset 74579 in vbox for trunk

Timestamp:

Oct 2, 2018 1:28:15 PM (6 years ago)

Author:

vboxsync

Message:

Linux Additions installer: revive initramfs support.
bugref:3809: Linux installer maintenance
Testing showed that with recent Linux guests our kernel modules are only used
(after all) after we rebuild the guest initramfs. We previously stopped doing
that because it caused installation and uninstallation of the Additions to
take an unreasonably long time. This second attempt at support reduces that
by putting more effort into only rebuilding initramfs images which we really
need to rebuild. It also adds support for openSUSE.
I also added some small fixes in the change to that rcvboxadd can run under
sh -e and cleaned up removal of old kernel modules and leftovers on Ubuntu
and Debian further.

File:

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

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

@@ -51 +51 @@
 # * Uninstalling the Additions and re-installing them does not trigger warnings.
 
+export LC_ALL=C
 PATH=$PATH:/bin:/sbin:/usr/sbin
 PACKAGE=VBoxGuestAdditions
@@ -59 +60 @@
 ## systemd logs information about service status, otherwise do that ourselves.
 QUIET=
+test -z "${KERN_VER}" && KERN_VER=`uname -r`
 
 setup_log()
@@ -312 +314 @@
 }
 
+## Update the initramfs.  Debian and Ubuntu put the graphics driver in, and
+# need the touch(1) command below.  Everyone else that I checked just need
+# the right module alias file from depmod(1) and only use the initramfs to
+# load the root filesystem, not the boot splash.  update-initramfs works
+# for the first two and dracut for every one else I checked.  We are only
+# interested in distributions recent enough to use the KMS vboxvideo driver.
+update_initramfs()
+{
+    ## kernel version to update for.
+    version="${1}"
+    depmod "${version}"
+    rm -f "/lib/modules/${version}/initrd/vboxvideo"
+    test -d "/lib/modules/${version}/initrd" &&
+        test -f "/lib/modules/${version}/misc/vboxvideo.ko" &&
+        touch "/lib/modules/${version}/initrd/vboxvideo"
+    if type dracut >/dev/null 2>&1; then
+        dracut -f --kver "${version}"
+    elif type update-initramfs >/dev/null 2>&1; then
+        update-initramfs -u -k "${version}"
+    fi
+}
+
 # Remove any existing VirtualBox guest kernel modules from the disk, but not
 # from the kernel as they may still be in use
 cleanup_modules()
 {
+    test "x${1}" = x--skip && skip_ver="${2}"
+    # Needed for Ubuntu and Debian, see update_initramfs
+    rm -f /lib/modules/*/initrd/vboxvideo
+    for i in /lib/modules/*/misc; do
+        kern_ver="${i%/misc}"
+        kern_ver="${kern_ver#/lib/modules/}"
+        unset do_update
+        for j in ${OLDMODULES}; do
+            test -f "${i}/${j}.ko" && do_update=1 && rm -f "${i}/${j}.ko"
+        done
+        test -n "${do_update}" && test "x${kern_ver}" != "x${skip_ver}" &&
+            update_initramfs "${kern_ver}"
+        # Remove empty /lib/modules folders which may have been kept around
+        rmdir -p "${i}" 2>/dev/null || true
+        unset keep
+        for j in /lib/modules/"${kern_ver}"/*; do
+            name="${j##*/}"
+            test -d "${name}" || test "${name%%.*}" != modules && keep=1
+        done
+        if test -z "${keep}"; then
+            rm -rf /lib/modules/"${kern_ver}"
+            rm -f /boot/initrd.img-"${kern_ver}"
+        fi
+    done
     for i in ${OLDMODULES}; do
         # We no longer support DKMS, remove any leftovers.
         rm -rf "/var/lib/dkms/${i}"*
-        # And remove old modules.
-        rm -f /lib/modules/*/misc/"${i}"*
-    done
-    # Remove leftover module folders.
-    for i in /lib/modules/*/misc; do
-        test -d "${i}" && rmdir -p "${i}" 2>/dev/null
     done
     rm -f /etc/depmod.d/vboxvideo-upstream.conf
@@ -333 +375 @@
 {
     # don't stop the old modules here -- they might be in use
-    test -z "${QUICKSETUP}" && cleanup_modules
+    test -z "${QUICKSETUP}" && cleanup_modules --skip "${KERN_VER}"
     # This does not work for 2.4 series kernels.  How sad.
     test -n "${QUICKSETUP}" && test -f "${MODULE_DIR}/vboxguest.ko" && return 0
@@ -347 +389 @@
         "${INSTALL_DIR}"/other/check_module_dependencies.sh 2>&1 &&
             info "Look at $LOG to find out what went wrong"
+        update_initramfs "${KERN_VER}"
         return 0
     fi
@@ -356 +399 @@
         module_build_log "$myerr"
         info  "Look at $LOG to find out what went wrong"
+        update_initramfs "${KERN_VER}"
         return 0
     fi
@@ -370 +414 @@
     echo "override vboxsf * misc" >> /etc/depmod.d/vboxvideo-upstream.conf
     echo "override vboxvideo * misc" >> /etc/depmod.d/vboxvideo-upstream.conf
+    update_initramfs "${KERN_VER}"
     depmod
     return 0
@@ -378 +423 @@
     # This is the LSB version of useradd and should work on recent
     # distributions
-    useradd -d /var/run/vboxadd -g 1 -r -s /bin/false vboxadd >/dev/null 2>&1
+    useradd -d /var/run/vboxadd -g 1 -r -s /bin/false vboxadd >/dev/null 2>&1 || true
     # And for the others, we choose a UID ourselves
-    useradd -d /var/run/vboxadd -g 1 -u 501 -o -s /bin/false vboxadd >/dev/null 2>&1
+    useradd -d /var/run/vboxadd -g 1 -u 501 -o -s /bin/false vboxadd >/dev/null 2>&1 || true
 
 }
@@ -462 +507 @@
     MODULE_SRC="$INSTALL_DIR/src/vboxguest-$INSTALL_VER"
     BUILDINTMP="$MODULE_SRC/build_in_tmp"
-    chcon -t bin_t "$BUILDINTMP" > /dev/null 2>&1
+    test -e /etc/selinux/config &&
+        chcon -t bin_t "$BUILDINTMP"
 
     test -z "${INSTALL_NO_MODULE_BUILDS}" && setup_modules