Changeset 42384 in vbox

Timestamp:

Jul 25, 2012 11:27:32 AM (12 years ago)

Author:

vboxsync

Message:

Autostart/darwin: bug fixes

Location:

trunk/src/VBox

Files:

• Frontends/VBoxAutostart/VBoxAutostart.cpp (modified) (5 diffs)
• Installer/darwin/VirtualBox/VBoxAutostartDarwin.sh (modified) (3 diffs)
• Installer/darwin/VirtualBox/org.virtualbox.vboxautostart.plist (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxAutostart/VBoxAutostart.cpp

@@ -105 +105 @@
  */
 static const RTGETOPTDEF g_aOptions[] = {
-#if defined(RT_OS_LINUX) || defined (RT_OS_SOLARIS) || defined(RT_OS_FREEBSD)
+#if defined(RT_OS_LINUX) || defined (RT_OS_SOLARIS) || defined(RT_OS_FREEBSD) || defined(RT_OS_DARWIN)
     { "--background",           'b',                                       RTGETOPT_REQ_NOTHING },
 #endif
@@ -703 +703 @@
                 break;
 
-#if defined(RT_OS_LINUX) || defined (RT_OS_SOLARIS) || defined(RT_OS_FREEBSD)
+#if defined(RT_OS_LINUX) || defined (RT_OS_SOLARIS) || defined(RT_OS_FREEBSD) || defined(RT_OS_DARWIN)
             case 'b':
                 pcszDescr = "Run in background (daemon mode).";
@@ -807 +807 @@
                 break;
 
-#if defined(RT_OS_LINUX) || defined (RT_OS_SOLARIS) || defined(RT_OS_FREEBSD)
+#if defined(RT_OS_LINUX) || defined (RT_OS_SOLARIS) || defined(RT_OS_FREEBSD) || defined(RT_OS_DARWIN)
             case 'b':
                 g_fDaemonize = true;
@@ -853 +853 @@
     }
 
-    if (fStart == fStop)
+    if (!fStart && !fStop)
+    {
+        displayHelp(argv[0]);
+        return RTMsgErrorExit(RTEXITCODE_FAILURE, "Either --start or --stop must be present");
+    }
+    else if (fStart && fStop)
     {
         displayHelp(argv[0]);
@@ -888 +893 @@
         return RTMsgErrorExit(RTEXITCODE_FAILURE, "failed to open release log (%s, %Rrc)", szError, rc);
 
-#if defined(RT_OS_LINUX) || defined (RT_OS_SOLARIS) || defined(RT_OS_FREEBSD)
+#if defined(RT_OS_LINUX) || defined (RT_OS_SOLARIS) || defined(RT_OS_FREEBSD) || defined(RT_OS_DARWIN)
     if (g_fDaemonize)
     {

trunk/src/VBox/Installer/darwin/VirtualBox/VBoxAutostartDarwin.sh

@@ -28 +28 @@
 
         # Check for known home directories and shells for daemons
-        if [[   "${HOMEDIR}" == "/var/empty" || "${HOMEDIR}" == "/dev/null"
+        if [[   "${HOMEDIR}" == "/var/empty" || "${HOMEDIR}" == "/dev/null" || "${HOMEDIR}" == "/var/root"
              || "${USERSHELL}" == "/usr/bin/false" || "${USERSHELL}" == "/dev/null" || "${USERSHELL}" == "/usr/sbin/uucico" ]]
         then
@@ -35 +35 @@
 
         # Start the daemon
-        su ${user} -c '/Applications/VirtualBox.app/Contents/MacOS/VBoxAutostart --start --background --config /etc/vbox/autostart.cfg'
+        su ${user} -c "/Applications/VirtualBox.app/Contents/MacOS/VBoxAutostart --quiet --start --background --config ${1}"
 
     done
@@ -41 +41 @@
 
 case $1 in
-    --start) vboxStartAllUserVms;;
+    --start) vboxStartAllUserVms ${2};;
           *) echo "Unknown option ${1}";;
 esac

trunk/src/VBox/Installer/darwin/VirtualBox/org.virtualbox.vboxautostart.plist

@@ -13 +13 @@
     <string>/Applications/VirtualBox.app/Contents/MacOS/VBoxAutostartDarwin.sh</string>
     <string>--start</string>
+    <string>/etc/vbox/autostart.cfg</string>
   </array>
 </dict>