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

Timestamp:

Feb 16, 2023 4:33:36 PM (2 years ago)

Author:

vboxsync

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

155901

Message:

Additions: Linux: rcvboxadd: Introduce "status-kernel" and "status-user" actions, bugref:10359.

"rcvboxadd status-kernel" is intended to verify if Guest Additions kernel modules are currently
loaded and running versions do match to Guest Additions installation version.

"rcvboxadd status-user" is intended to verify if user-space processes are currently running. At
the moment only checks if VBoxService is running, can be extended later on.

File:

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

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

@@ -176 +176 @@
 }
 
+running_module()
+{
+    lsmod | grep -q $1
+}
+
 # Get version string of currently running kernel module.
 running_module_version()
@@ -199 +204 @@
 
     [ "$expected" = "$(running_module_version "$mod")" ] || return
+}
+
+# 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.
+check_status_kernel()
+{
+    for mod in vboxguest vboxsf; do
+        running_module "$mod" || fail "module $mod not loaded"
+        check_running_module_version "$mod" || fail "currently loaded module $mod version ($(running_module_version "$mod")) does not match to VirtualBox Guest Additions installation version ($VBOX_VERSION $VBOX_REVISION)"
+    done
+}
+
+# Checks if systemctl is present and functional (i.e., systemd is the init process).
+use_systemd()
+{
+    systemctl status >/dev/null 2>&1
+}
+
+## Did we install a systemd service?
+systemd_service_installed()
+{
+    ## Name of service to test.
+    name="${1}"
+
+    test -f /lib/systemd/system/"${name}".service ||
+        test -f /usr/lib/systemd/system/"${name}".service
+}
+
+## Perform an action on a service
+do_sysvinit_action()
+{
+    ## Name of service to start.
+    name="${1}"
+    ## The action to perform, normally "start", "stop" or "status".
+    action="${2}"
+
+    if use_systemd -a systemd_service_installed "${name}"; then
+        systemctl -q ${action} "${name}"
+    elif test -x "/etc/rc.d/init.d/${name}"; then
+        "/etc/rc.d/init.d/${name}" "${action}" quiet
+    elif test -x "/etc/init.d/${name}"; then
+        "/etc/init.d/${name}" "${action}" quiet
+    fi
+}
+
+# Check whether user-land processes are running.
+# Currently only check for VBoxService.
+check_status_user()
+{
+    do_sysvinit_action vboxadd-service status >/dev/null 2>&1
 }
 
@@ -645 +703 @@
 }
 
-
 # Returns "1" if module is signed and signature can be verified
 # with public key provided in DEB_PUB_KEY. Or empty string otherwise.
@@ -889 +946 @@
 }
 
-# Checks if systemctl is present and functional (i.e., systemd is the init process).
-use_systemd()
-{
-    systemctl status >/dev/null 2>&1
-}
-
-## Did we install a systemd service?
-systemd_service_installed()
-{
-    ## Name of service to test.
-    name="${1}"
-
-    test -f /lib/systemd/system/"${name}".service ||
-        test -f /usr/lib/systemd/system/"${name}".service
-}
-
-## Perform an action on a service
-do_sysvinit_action()
-{
-    ## Name of service to start.
-    name="${1}"
-    ## The action to perform, normally "start", "stop" or "status".
-    action="${2}"
-
-    if use_systemd -a systemd_service_installed "${name}"; then
-        systemctl -q ${action} "${name}"
-    elif test -x "/etc/rc.d/init.d/${name}"; then
-        "/etc/rc.d/init.d/${name}" "${action}" quiet
-    elif test -x "/etc/init.d/${name}"; then
-        "/etc/init.d/${name}" "${action}" quiet
-    fi
-}
-
 # Check if process with this PID is running.
 check_pid()
@@ -1047 +1071 @@
     if [ $? -eq 0 ]; then
 
-        # Check if we just loaded modules of correct version. Skip vboxvideo
-        # since it's not loaded for very old guests.
-        for mod in vboxguest vboxsf; do
-            check_running_module_version "$mod" || fail "currently loaded module $mod version ($(running_module_version "$mod")) does not match to VirtualBox Guest Additions installation version ($VBOX_VERSION $VBOX_REVISION)"
-        done
+        # Check if we just loaded modules of correct version.
+        check_status_kernel
+
+        # Check if user-land processes were restarted as well.
+        check_status_user
+
         # Take reported version of running Guest Additions from running vboxguest module (as a paranoia check).
         info "kernel modules and services $(running_module_version "vboxguest") reloaded"
@@ -1119 +1144 @@
     dmnstatus
     ;;
+status-kernel)
+    check_status_kernel && info "Kernel modules are loaded"
+    ;;
+status-user)
+    check_status_user
+    if [ $? -eq 0 ]; then
+        info "User-land services are running"
+    else
+        fail "User-land services are not running"
+    fi
+    ;;
 *)
-    echo "Usage: $0 {start|stop|restart|reload|status|setup|quicksetup|cleanup} [quiet]"
+    echo "Usage: $0 {start|stop|restart|reload|status|status-kernel|status-user|setup|quicksetup|cleanup} [quiet]"
     exit 1
 esac