Changeset 107920 in vbox for trunk/src/VBox/Additions

Timestamp:

Jan 23, 2025 4:19:03 PM (3 months ago)

Author:

vboxsync

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

167151

Message:

Additions: Linux: rcvboxadd: Use generic function to check if kernel module is loaded, bugref:10359.

File:

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

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

@@ -168 +168 @@
 VBOX_REVISION="r`"$VBOXCONTROL" --version | cut -d r -f2`"
 [ "$VBOX_REVISION" != "r" ] || VBOX_REVISION='unknown'
-
-# Returns if the vboxguest module is running or not.
-#
-# Returns true if vboxguest module is running, false if not.
-running_vboxguest()
-{
-    lsmod | grep -q "vboxguest[^_-]"
-}
-
-# Returns if the vboxsf module is running or not.
-#
-# Returns true if vboxsf module is running, false if not.
-running_vboxsf()
-{
-    lsmod | grep -q "vboxsf[^_-]"
-}
 
 # Returns if a specific module is running or not.
@@ -881 +865 @@
     groupadd -r -f vboxdrmipc >/dev/null 2>&1
 
-    if  running_vboxguest; then
+    if  running_module "vboxguest"; then
         # Only warn user if currently loaded modules version do not match Guest Additions Installation.
         check_running_module_version "vboxguest" || info "Running kernel modules will not be replaced until the system is restarted or 'rcvboxadd reload' triggered"
@@ -1164 +1148 @@
             # If final goal of unloading vboxguest.ko won't be met, we will fail on
             # the next step anyway.
-            running_vboxsf && modprobe -r vboxsf >/dev/null  2>&1
-            running_vboxguest
+            running_module "vboxsf" && modprobe -r vboxsf >/dev/null  2>&1
+            running_module "vboxguest"
             if [ $? -eq 0 ]; then
                 modprobe -r vboxguest >/dev/null  2>&1
@@ -1176 +1160 @@
 
         # Check if we succeeded with unloading vboxguest after several attempts.
-        running_vboxguest
+        running_module "vboxguest"
         if [ $? -eq 0 ]; then
             info "cannot reload kernel modules: one or more module(s) is still in use"
@@ -1218 +1202 @@
 dmnstatus()
 {
-    if running_vboxguest; then
+    if running_module "vboxguest"; then
         echo "The VirtualBox Additions are currently running."
     else