Changeset 42987 in vbox

Timestamp:

Aug 25, 2012 1:36:58 AM (13 years ago)

Author:

vboxsync

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

80319

Message:

Installer/darwin: drop checkforrunningvm in favor of a one-liner. That should work on Leopard too. Dropped the InstallationCheck in VBoxKEXTs which does the same as the javascript in distribution.dist already did and may cause later install errors with generic message (probably because we didn't ship InstallationCheck.strings, but whatever).

Location:

trunk/src/VBox/Installer/darwin

Files:

• Makefile.kmk (modified) (2 diffs)
• VBoxKEXTs/English.lproj (deleted)
• VBoxKEXTs/InstallationCheck (deleted)
• VBoxKEXTs/PkgBuildComponent.plist (modified) (1 diff)
• VirtualBox_mpkg/checkforrunningvms (deleted)
• VirtualBox_mpkg/distribution.dist (modified) (1 diff)

trunk/src/VBox/Installer/darwin/Makefile.kmk

@@ -207 +207 @@
                 $(VBOX_PATH_DI_SRC)/VirtualBox_mpkg/Localizable.strings
         $(INSTALL) -m 0644 $(VBOX_BRAND_DARWIN_INSTALLER_BG)                                    $(VBOX_PATH_PACK_TMP)/VirtualBox.mpkg.res/background.tif
-        $(INSTALL) -m 0766 $(VBOX_PATH_DI_SRC)/VirtualBox_mpkg/checkforrunningvms               $(VBOX_PATH_PACK_TMP)/VirtualBox.mpkg.res/checkforrunningvms
         $(foreach f,$(VBOX_INSTALLER_ADD_LANGUAGES), \
                 $(MKDIR) -p \
@@ -313 +312 @@
                 $(VBOX_PATH_DI_SRC)/VBoxKEXTs/PkgBuildComponent.plist
         @# Copy the resources.
-        $(INSTALL) -m 0755 $(VBOX_PATH_DI_SRC)/VBoxKEXTs/InstallationCheck                     $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.res/
         $(INSTALL) -m 0755 $(VBOX_PATH_DI_SRC)/VBoxKEXTs/postflight                            $(VBOX_PATH_PACK_TMP)/VBoxKEXTs.pkg.res/
         @# Build the package.

trunk/src/VBox/Installer/darwin/VBoxKEXTs/PkgBuildComponent.plist

@@ -9 +9 @@
             <key>BundleHasStrictIdentifier</key>            <false/>
             <key>BundleOverwriteAction</key>                <string>upgrade</string>
-            <key>BundlePreInstallScriptPath</key>           <string>InstallationCheck</string>
        </dict>
        <dict>

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

@@ -24 +24 @@
        try
        {
-         test = system.sysctl('hw.machine');
-         system.log("Hardware architecture detected: " + test);
-         result = !(test == 'i386' || test == 'x86_64');
-       } catch (e) { system.log(e); }
+           test = system.sysctl('hw.machine');
+           system.log("Hardware architecture detected: " + test);
+           result = (test == 'i386' || test == 'x86_64');
+       } catch (e) { system.log(e); result = false; }
 
-       if(result)
+       if (!result)
        {
-         my.result.type = 'Fatal';
-         my.result.title = system.localizedString('UNSUPPORTED_HW_MACHINE_TLE');
-         my.result.message = system.localizedString('UNSUPPORTED_HW_MACHINE_MSG');
-         return result;
+           my.result.type = 'Fatal';
+           my.result.title = system.localizedString('UNSUPPORTED_HW_MACHINE_TLE');
+           my.result.message = system.localizedString('UNSUPPORTED_HW_MACHINE_MSG');
+           return result;
        }
 
-       isLeopard = false;
        try
        {
-         test = system.version['ProductVersion'];
-         system.log("OS version detected: " + test);
-         result = !(system.compareVersions(test, '10.5') >= 0);
-         isLeopard = !!(system.compareVersions(test, '10.6') < 0); 
-       } catch (e) { system.log(e); }
+           test = system.version['ProductVersion'];
+           system.log("OS version detected: " + test);
+           result = (system.compareVersions(test, '10.5') >= 0);
+       } catch (e) { system.log(e); result = false; }
 
-       if(result)
+       if (!result)
        {
-         my.result.type = 'Fatal';
-         my.result.title = system.localizedString('UNSUPPORTED_OS_TLE');
-         my.result.message = system.localizedString('UNSUPPORTED_OS_MSG');
-         return result;
+           my.result.type = 'Fatal';
+           my.result.title = system.localizedString('UNSUPPORTED_OS_TLE');
+           my.result.message = system.localizedString('UNSUPPORTED_OS_MSG');
+           return result;
        }
 
-       system.log("isLeopard: " + isLeopard);
-       if (!isLeopard)
+       try
        {
-         try
-         {
-           rcScript = system.run('checkforrunningvms');
-           result = !!(rcScript == '1');
-           system.log("checkforrunningvms returned: " + rcScript);
-         } catch (e) { system.log(e); }
+           /* 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 "VirtualBoxVM.*startvm|VBoxNetDHCP" | /usr/bin/grep -qv grep');
+           result = (rcScript != 0);
+           system.log("system.run /bin/sh .. returned: " + rcScript + " result=" + result);
+       } catch (e) { system.log(e); result = false; }
 
-         if(result)
-         {
+       if (!result)
+       {
            my.result.type = 'Fatal';
            my.result.title = system.localizedString('RUNNING_VMS_TLE');
            my.result.message = system.localizedString('RUNNING_VMS_MSG');
-         }
+           return result;
        }
+
+       system.log("result:" + result);
        return result;
     }