Changeset 47880 in vbox for trunk/src/VBox/Installer/darwin

Timestamp:

Aug 20, 2013 9:47:09 AM (11 years ago)

Author:

vboxsync

Message:

Installer\darwin: added VBoxNetLwipNAT (not tested).

Location:

trunk/src/VBox/Installer/darwin

Files:

• DiskImage/VirtualBox_Uninstall.tool (modified) (1 diff)
• Makefile.kmk (modified) (3 diffs)
• VirtualBox_mpkg/distribution.dist (modified) (1 diff)

trunk/src/VBox/Installer/darwin/DiskImage/VirtualBox_Uninstall.tool

@@ -127 +127 @@
 # Note! comm isn't supported on Tiger, so we make -c to do the stripping.
 #
-my_processes="`ps -axco 'pid uid command' | grep -wEe '(VirtualBox|VirtualBoxVM|VBoxManage|VBoxHeadless|vboxwebsrv|VBoxXPCOMIPCD|VBoxSVC|VBoxNetDHCP)' | grep -vw grep | grep -vw VirtualBox_Uninstall.tool | tr '\n' '\a'`";
+my_processes="`ps -axco 'pid uid command' | grep -wEe '(VirtualBox|VirtualBoxVM|VBoxManage|VBoxHeadless|vboxwebsrv|VBoxXPCOMIPCD|VBoxSVC|VBoxNetDHCP|VBoxNetLwipNAT)' | grep -vw grep | grep -vw VirtualBox_Uninstall.tool | tr '\n' '\a'`";
 if test -n "$my_processes"; then
     echo 'Warning! Found the following active VirtualBox processes:'

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

@@ -445 +445 @@
         MacOS/VirtualBox.dylib \
         MacOS/VBoxNetDHCP.dylib \
+        MacOS/VBoxNetLwipNAT.dylib \
         MacOS/VBoxHeadless.dylib
 endif
@@ -496 +497 @@
         MacOS/VBoxNetAdpCtl \
         MacOS/VBoxNetDHCP \
+        MacOS/VBoxNetLwipNAT \
         MacOS/VBoxExtPackHelperApp \
         MacOS/VBoxBalloonCtrl \
@@ -827 +829 @@
  ifdef VBOX_WITH_COMBINED_PACKAGE
         sudo chmod u+s \
-                $(foreach bin,VBoxHeadless VirtualBox VirtualBoxVM VBoxNetAdpCtl VBoxNetDHCP,\
+                $(foreach bin,VBoxHeadless VirtualBox VirtualBoxVM VBoxNetAdpCtl VBoxNetDHCP VBoxNetLwipNAT,\
                         $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/MacOS/$(bin)-x86 \
                         $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/MacOS/$(bin)-amd64)
  else
         sudo chmod u+s \
-                $(foreach bin,VBoxHeadless VirtualBox VirtualBoxVM VBoxNetAdpCtl VBoxNetDHCP,\
+                $(foreach bin,VBoxHeadless VirtualBox VirtualBoxVM VBoxNetAdpCtl VBoxNetDHCP VBoxNetLwipNAT,\
                         $(VBOX_PATH_PACK_TMP)/VirtualBox.pkg.root/Applications/VirtualBox.app/Contents/MacOS/$(bin)-$(KBUILD_TARGET_ARCH))
  endif

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

@@ -56 +56 @@
            /* 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');
+           rcScript = system.run('/bin/sh', '-c', '/bin/ps -e | /usr/bin/grep -E "VirtualBoxVM.*startvm|VBoxNetDHCP|VBoxNetLwipNAT" | /usr/bin/grep -qv grep');
            result = (rcScript != 0);
            system.log("system.run /bin/sh .. returned: " + rcScript + " result=" + result);