Changeset 89203 in vbox for trunk/src/VBox

Timestamp:

May 20, 2021 4:32:38 PM (4 years ago)

Author:

vboxsync

Message:

Installer: Linux: vboxdrv.sh: update modules rebuild logic, bugref:9958.

Do not trigger modules rebuild if they are already available in system,
their version matches to current VirtualBox installation and they are
located outside of /lib/modules/*/misc.

File:

• trunk/src/VBox/Installer/linux/vboxdrv.sh (modified) (4 diffs)

trunk/src/VBox/Installer/linux/vboxdrv.sh

@@ -274 +274 @@
 }
 
+# Returns path to module file as seen by modinfo(8) or empty string.
+module_path()
+{
+    mod="$1"
+    [ -n "$mod" ] || return
+
+    modinfo "$mod" 2>/dev/null | grep -e "^filename:" | tr -s ' ' | cut -d " " -f2
+}
+
 # Returns module version if module is available or empty string.
 module_version()
@@ -292 +301 @@
 }
 
-# Returns "1" if module is available in the system and its version and revision
-# number do match to current VirtualBox installation. Or empty string otherwise.
+# Returns "1" if externally built module is available in the system and its
+# version and revision number do match to current VirtualBox installation.
+# Or empty string otherwise.
 module_available()
 {
@@ -299 +309 @@
     [ -n "$mod" ] || return
 
-    [ "$VBOX_VERSION" = "$(module_version $mod)" ] || return
-    [ "$VBOX_REVISION" = "$(module_revision $mod)" ] || return
+    [ "$VBOX_VERSION" = "$(module_version "$mod")" ] || return
+    [ "$VBOX_REVISION" = "$(module_revision "$mod")" ] || return
+
+    # Check if module belongs to VirtualBox installation.
+    #
+    # We have a convention that only modules from /lib/modules/*/misc
+    # belong to us. Modules from other locations are treated as
+    # externally built.
+    mod_path="$(module_path "$mod")"
+
+    # If module path points to a symbolic link, resolve actual file location.
+    [ -L "$mod_path" ] && mod_path="$(readlink -e -- "$mod_path")"
+
+    # File exists?
+    [ -f "$mod_path" ] || return
+
+    # Extract last component of module path and check whether it is located
+    # outside of /lib/modules/*/misc.
+    mod_dir="$(dirname "$mod_path" | sed 's;^.*/;;')"
+    [ "$mod_dir" != "misc" ] || return
 
     echo "1"
@@ -332 +360 @@
     fi
 
-    # Check if system already has matching modules installed.
-    [ "$(setup_complete)" = "1" ] || setup
-
     if ! running vboxdrv; then
+
+        # Check if system already has matching modules installed.
+        [ "$(setup_complete)" = "1" ] || setup
+
         if ! rm -f $DEVICE; then
             failure "Cannot remove $DEVICE"