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

Timestamp:

Apr 21, 2023 3:47:20 PM (21 months ago)

Author:

vboxsync

Message:

Additions: Linux: rcvboxadd: Do not use systemctl when reloading VBoxService, bugref:10359.

Reload action is triggered by default when systemd starts vboxadd.service. Some distributions
do not like when "nested" systemctl is called in this context, resulting in a deadlock on service
start. Instead of using systemctl, try to run underlying script directly.

File:

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

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

@@ -149 +149 @@
 BUILDINTMP="$MODULE_SRC/build_in_tmp"
 
+# Path to VBoxService control script.
+VBOX_SERVICE_SCRIPT="/usr/sbin/rcvboxadd-service"
+
 # Attempt to detect VirtualBox Guest Additions version and revision information.
 VBOXCONTROL="${INSTALL_DIR}/bin/VBoxControl"
@@ -230 +233 @@
 
     [ "$expected" = "$(running_module_version "$mod")" ] || return
-}
-
-
-# Checks if systemctl is present and functional (i.e., systemd is the init process).
-use_systemd()
-{
-    systemctl status >/dev/null 2>&1
-}
-
-# Returns if we did install a service as a systemd service.
-#
-# Input $1: Service name to check.
-#
-# Returns true if the service is installed as a systemd service, false if not.
-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
-}
-
-## Performs 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
 }
 
@@ -1088 +1053 @@
 
     # Stop VBoxService if running.
-    do_sysvinit_action vboxadd-service status >/dev/null 2>&1
+    $VBOX_SERVICE_SCRIPT status >/dev/null 2>&1
     if [ $? -eq 0 ]; then
-        do_sysvinit_action vboxadd-service stop >/dev/null 2>&1 || fail "unable to stop VBoxService"
+        $VBOX_SERVICE_SCRIPT stop >/dev/null 2>&1 || fail "unable to stop VBoxService"
     fi
 
@@ -1141 +1106 @@
 
         # Start VBoxService and VBoxDRMClient (systemctl start vboxadd-service.service).
-        [ $? -eq 0 ] && do_sysvinit_action vboxadd-service start >/dev/null 2>&1
+        [ $? -eq 0 ] && $VBOX_SERVICE_SCRIPT start >/dev/null 2>&1
 
         # Reload VBoxClient processes.