Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp	(revision 55597)
+++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp	(revision 55598)
@@ -310,9 +310,9 @@
                      "                              [--passwordfile <file> | --password <password>]\n"
                      "                              [--domain <domain>] [--verbose] [--timeout <msec>]\n"
-                     "                              [--setenv <NAME>=<VALUE>] [--unset <NAME>]\n"
-                     "                              [--unquoted-args] [--no-wait-stdout|--wait-stdout]\n"
+                     "                              [--putenv <NAME>[=<VALUE>]] [--unquoted-args]\n"
+                     "                              [--no-wait-stdout|--wait-stdout]\n"
                      "                              [--no-wait-stderr|--wait-stderr]\n"
                      "                              [--dos2unix] [--unix2dos]\n"
-                     "                              [--] <program/arg0> [argument1] ... [argumentN]]\n"
+                     "                              -- <program/arg0> [argument1] ... [argumentN]]\n"
                      "\n");
     if (uSubCmd & USAGE_GSTCTRL_START)
@@ -322,7 +322,7 @@
                      "                              [--passwordfile <file> | --password <password>]\n"
                      "                              [--domain <domain>] [--verbose] [--timeout <msec>]\n"
-                     "                              [--setenv <NAME>=<VALUE>] [--unset <NAME>]\n"
-                     "                              [--unquoted-args] [--dos2unix] [--unix2dos]\n"
-                     "                              [--] <program/arg0> [argument1] ... [argumentN]]\n"
+                     "                              [--putenv <NAME>[=<VALUE>]] [--unquoted-args]\n"
+                     "                              [--dos2unix] [--unix2dos]\n"
+                     "                              -- <program/arg0> [argument1] ... [argumentN]]\n"
                  "\n");
     if (uSubCmd == USAGE_GSTCTRL_EXEC)
@@ -1232,5 +1232,5 @@
     static const RTGETOPTDEF s_aOptions[] =
     {
-        { "--environment",                  'E',                                      RTGETOPT_REQ_STRING  },
+        { "--putenv",                       'E',                                      RTGETOPT_REQ_STRING  },
         { "--executable",                   'e',                                      RTGETOPT_REQ_STRING  },
         { "--timeout",                      't',                                      RTGETOPT_REQ_UINT32  },
@@ -1257,7 +1257,6 @@
     com::SafeArray<IN_BSTR>                 aEnv;
     const char *                            pszImage            = NULL;
-    bool                                    fDetached           = false;
-    bool                                    fWaitForStdOut      = true;
-    bool                                    fWaitForStdErr      = true;
+    bool                                    fWaitForStdOut      = fRunCmd;
+    bool                                    fWaitForStdErr      = fRunCmd;
     RTVFSIOSTREAM                           hVfsStdOut          = NIL_RTVFSIOSTREAM;
     RTVFSIOSTREAM                           hVfsStdErr          = NIL_RTVFSIOSTREAM;
@@ -1279,8 +1278,7 @@
                 case 'E':
                     if (   ValueUnion.psz[0] == '\0'
-                        || ValueUnion.psz[0] == '='
-                        || strchr(ValueUnion.psz, '=') == NULL)
+                        || ValueUnion.psz[0] == '=')
                         return errorSyntaxEx(USAGE_GUESTCONTROL, USAGE_GSTCTRL_RUN,
-                                             "Invalid argument variable=value pair: '%s'", ValueUnion.psz);
+                                             "Invalid argument variable[=value]: '%s'", ValueUnion.psz);
                     aEnv.push_back(Bstr(ValueUnion.psz).raw());
                     break;