Changeset 107964 in vbox for trunk/src/VBox/Installer/linux

Timestamp:

Jan 28, 2025 2:18:42 PM (7 weeks ago)

Author:

vboxsync

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

167214

Message:

Installer: Linux: Ask VBoxSVC to terminate gacefully and wait for it if it is running during installation, bugref:10850.

This behavior was in place before, however we did not send SIGUSR1 to VBoxSVC
in case of .run installer (or did it in condition which was never true) and we
were waiting too litle to give it a chance to terminate.

Location:

trunk/src/VBox/Installer/linux

Files:

• debian/preinst (modified) (1 diff)
• routines.sh (modified) (1 diff)
• rpm/VirtualBox.tmpl.spec (modified) (1 diff)

trunk/src/VBox/Installer/linux/debian/preinst

@@ -65 +65 @@
   VBOXSVC_PID=`pidof VBoxSVC 2>/dev/null || true`
   if [ -n "$VBOXSVC_PID" ]; then
-    # ask the daemon to terminate immediately
+    # Ask VBoxSVC to terminate gracefully if it is not
+    # busy with handling client requests.
     kill -USR1 $VBOXSVC_PID
-    sleep 1
+    # Wait for VBoxSVC to terminate.
+    for attempt in 1 2 3 4 5 6 7 8 9 10; do
+      [ -n "$(pidof VBoxSVC 2> /dev/null)" ] && sleep 1
+    done
+    # Still running?
     if pidof VBoxSVC > /dev/null 2>&1; then
       db_fset virtualbox/old-running seen false || true

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

@@ -127 +127 @@
     VBOXSVC_PID=`pidof VBoxSVC 2> /dev/null`
     if [ -n "$VBOXSVC_PID" ]; then
-        if [ -f /etc/init.d/vboxweb-service ]; then
-            kill -USR1 $VBOXSVC_PID
-        fi
-        sleep 1
+        # Ask VBoxSVC to terminate gracefully if it is not
+        # busy with handling client requests.
+        kill -USR1 $VBOXSVC_PID
+        # Wait for VBoxSVC to terminate.
+        for attempt in 1 2 3 4 5 6 7 8 9 10; do
+            [ -n "$(pidof VBoxSVC 2> /dev/null)" ] && sleep 1
+        done
+        # Still running?
         if pidof VBoxSVC > /dev/null 2>&1; then
             echo 1>&2 "A copy of VirtualBox is currently running.  Please close it and try again."

trunk/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec

@@ -261 +261 @@
 VBOXSVC_PID=`pidof VBoxSVC 2>/dev/null || true`
 if [ -n "$VBOXSVC_PID" ]; then
-  # ask the daemon to terminate immediately
+  # Ask VBoxSVC to terminate gracefully if it is not
+  # busy with handling client requests.
   kill -USR1 $VBOXSVC_PID
-  sleep 1
+  # Wait for VBoxSVC to terminate.
+  for attempt in 1 2 3 4 5 6 7 8 9 10; do
+    [ -n "$(pidof VBoxSVC 2> /dev/null)" ] && sleep 1
+  done
+  # Still running?
   if pidof VBoxSVC > /dev/null 2>&1; then
     echo "A copy of VirtualBox is currently running.  Please close it and try again."