Changeset 107963 in vbox for trunk/src/VBox/Additions/linux/installer/vboxadd.sh

Timestamp:

Jan 28, 2025 12:55:41 PM (4 weeks ago)

Author:

vboxsync

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

167213

Message:

Additions: Linux: rcvboxadd: Do optional checks for vboxsf and vboxvideo when checking status-kernel, bugref:10359.

Those two modules are loaded conditionally.

• vboxsf -- might be not loaded when VM has not Shared Folder mappings,

check this before verifying module.

• vboxvideo -- only loaded when VM is using VBoxVGA and VBoxSVGA graphics,

Similar to vboxsf, check this condition first.

File:

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

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

@@ -982 +982 @@
 
 # A wrapper for check_running_module_version.
-# Go through the list of Guest Additions' modules and
-# verify if they are loaded and running version matches
-# to current installation version. Skip vboxvideo since
-# it is not loaded for old guests.
+# Verify if module is loaded and its version matches
+# to current Additions installation version.
+check_running_module()
+{
+    mod="$1"
+
+    # Check args.
+    [ -n "$mod" ] || return
+
+    # During reload action it may take some time for module
+    # to be fully loaded, so make a few attempts while checking this.
+    for attempt in 1 2 3 4 5; do
+
+        # Wait before the next attempt.
+        [ -n "$vbox_add_wait" -a $? -ne 0 ] && sleep 1
+
+        running_module "$mod"
+        if [ $? -eq 0 ]; then
+            mod_is_running="1"
+            check_running_module_version "$mod"
+            [ $? -eq 0 ] && break
+        else
+            mod_is_running=""
+            false
+        fi
+
+    done
+
+    # In case of error, try to print out proper reason of failure.
+    if [ $? -ne 0 ]; then
+        # Was module loaded?
+        if [ -z "$mod_is_running" ]; then
+            info "module $mod is not loaded"
+        else
+            # If module was loaded it means that it has incorrect version.
+            info "currently loaded module $mod version ($(running_module_version "$mod")) does not match to VirtualBox Guest Additions installation version ($VBOX_VERSION $VBOX_REVISION)"
+        fi
+
+        # Set "bad" rc.
+        false
+    fi
+}
+
+# Go through list of Additions modules and check
+# if they were properly loaded.
 check_status_kernel()
 {
-    for mod in vboxguest vboxsf; do
-
-        for attempt in 1 2 3 4 5; do
-
-            # Wait before the next attempt.
-            [ -n "$vbox_add_wait" -a $? -ne 0 ] && sleep 1
-
-            running_module "$mod"
-            if [ $? -eq 0 ]; then
-                mod_is_running="1"
-                check_running_module_version "$mod"
-                [ $? -eq 0 ] && break
-            else
-                mod_is_running=""
-                false
-            fi
-
-        done
-
-        # In case of error, try to print out proper reason of failure.
-        if [ $? -ne 0 ]; then
-            # Was module loaded?
-            if [ -z "$mod_is_running" ]; then
-                info "module $mod is not loaded"
-            else
-                # If module was loaded it means that it has incorrect version.
-                info "currently loaded module $mod version ($(running_module_version "$mod")) does not match to VirtualBox Guest Additions installation version ($VBOX_VERSION $VBOX_REVISION)"
-            fi
-
-            # Set "bad" rc.
-            false
-        fi
-
-    done
+    # Module vboxguest should be loaded unconditionally once Guest Additions were installed.
+    check_running_module "vboxguest"
+
+    # Module vboxsf module might not be loaded if VM has no Shared Folder mappings.
+    # Check that first and then verify the module.
+    if [ $? -eq 0 ]; then
+        VBoxControl sharedfolder list >/dev/null 2>&1
+        if [ $? -eq 0 ]; then
+            check_running_module "vboxsf"
+        else
+            # Do not spoil $?.
+            true
+        fi
+    fi
+
+    # Module vboxvideo is optional and expected to be loaded only when VM is
+    # running VBoxVGA or VBoxSVGA graphics.
+    if [ $? -eq 0 ]; then
+        gpu_vendor=$(lspci | grep 'VGA compatible controller' | cut -d ' ' -f 5 2>/dev/null)
+        if [ "gpu_vendor" = "InnoTek" ]; then
+            check_running_module "vboxvideo"
+        else
+            # Do not spoil $?.
+            true
+        fi
+    fi
 }
 
@@ -1237 +1270 @@
     # modules. This operation is asynchronous and requires some time for
     # modules to be loaded in most of the cases. By setting this variable, we
-    # ask check_status_kernel() to wait a bit before making a decision
+    # ask check_running_module() to wait a bit before making a decision
     # whether modules were loaded or not.
     vbox_add_wait=1