Changeset 50572 in vbox

Timestamp:

Feb 25, 2014 10:25:44 AM (11 years ago)

Author:

vboxsync

Message:

Installer/darwin: kill idle VBoxSVC instances which may exist due to a bug in the previously installed version, plus a minor wording change for the messages

Location:

trunk/src/VBox/Installer/darwin/VirtualBox_mpkg

Files:

• Localizable.strings (modified) (1 diff)
• distribution.dist (modified) (2 diffs)

trunk/src/VBox/Installer/darwin/VirtualBox_mpkg/Localizable.strings

@@ -11 +11 @@
 
 'RUNNING_VMS_TLE' = "Running VirtualBox VM's detected!";
-'RUNNING_VMS_MSG' = "The installer has detected running Virtual Machines. Please shutdown all running VirtualBox machines and then restart the installation.";
+'RUNNING_VMS_MSG' = "The installer has detected running Virtual Machines. Please shut down all running VirtualBox machines and then restart the installation.";
 
 'UNSUPPORTED_HW_MACHINE_TLE' = "Unsupported hardware architecture detected!";

trunk/src/VBox/Installer/darwin/VirtualBox_mpkg/distribution.dist

@@ -2 +2 @@
 <!--
 #
-# Copyright (C) 2008-2012 Oracle Corporation
+# Copyright (C) 2008-2014 Oracle Corporation
 #
 # This file is part of VirtualBox Open Source Edition (OSE), as
@@ -54 +54 @@
        try
        {
+           /* The following shell script uses tools which were added in 10.8
+              (Mountain Lion) and later, in particular pgrep and pkill. */
+           if (system.compareVersions(system.version['ProductVersion'], '10.8') >= 0)
+           {
+               /* Embedded scripts are not available here. So, just do a
+                  command line checking if any VBoxXPCOMIPCD has more than one
+                  client, and if there are none, kill all the usual suspects to
+                  get a clean slate. This is done because the VirtualBox event
+                  handling had a bug which allowed no longer present passive
+                  event listeners to block VBoxSVC processes from exiting until
+                  the waiting time was elapsed. In the extreme case this was
+                  infinitely long, blocking updates. */
+               system.run('/bin/sh', '-c', 'pids=`/usr/bin/pgrep VBoxXPCOMIPCD` rc=0; [ -n "$pid" ] || for i in $pids; do c=`/usr/sbin/lsof -p $i | /usr/bin/grep -E \'^[^ ]+ +[^ ]+ +[^ ]+ +[^ ]+ +unix\' | wc -l`; [ $c -le 2 ] || rc=1; done; if [ $rc -eq 0 ]; then pkill \'^(VirtualBox)|(VBoxNetDHCP)|(VBoxNetNAT)|(VBoxHeadless)|(VBoxXPCOMIPCD)|(VBoxSVC)$\'; sleep 1; fi');
+           }
+       } catch (e) { system.log(e); }
+
+       try
+       {
            /* Embedded scripts are not available here. So, just do a command
               line checking for running VMs instead. */
-           rcScript = system.run('/bin/sh', '-c', '/bin/ps -e | /usr/bin/grep -E "VirtualBox.*startvm|VBoxNetDHCP|VBoxNetNAT|VBoxHeadless|VBoxSVC" | /usr/bin/grep -qv grep');
+           rcScript = system.run('/bin/sh', '-c', '/bin/ps -e | /usr/bin/grep -E \'V[i]rtualBox.*startvm|VBoxNetDHCP|VBoxNetNAT|VBoxHeadless|VBoxSVC\'');
            result = (rcScript != 0);
            system.log("system.run /bin/sh .. returned: " + rcScript + " result=" + result);