Changeset 68095 in vbox for trunk

Timestamp:

Jul 24, 2017 12:45:11 PM (7 years ago)

Author:

vboxsync

Message:

VBoxManage/unattended: Implemented new attributes.

File:

• trunk/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp (modified) (8 diffs)

trunk/src/VBox/Frontends/VBoxManage/VBoxManageMisc.cpp

@@ -1288 +1288 @@
     bool        fSetImageIdx            = false;
     uint32_t    idxImage                = 0;
-    const char *pszPostInstallCommand   = NULL;
+    const char *pszLocale               = NULL;
+    const char *pszCountry              = NULL;
+    const char *pszTimeZone             = NULL;
+    const char *pszProxy                = NULL;
     Utf8Str     strAbsAuxiliaryBasePath;
     const char *pszAuxiliaryBasePath    = NULL;
@@ -1295 +1298 @@
     Utf8Str     strAbsPostInstallScriptTemplatePath;
     const char *pszPostInstallScriptTemplatePath = NULL;
+    const char *pszPostInstallCommand   = NULL;
+    const char *pszExtraInstallKernelParameters = NULL;
     const char *pszSessionType          = "headless";
 
@@ -1305 +1310 @@
     static const RTGETOPTDEF s_aOptions[] =
     {
-        { "--iso",                      'i', RTGETOPT_REQ_STRING },
-        { "--user",                     'u', RTGETOPT_REQ_STRING },
-        { "--password",                 'p', RTGETOPT_REQ_STRING },
-        { "--full-user-name",           'U', RTGETOPT_REQ_STRING },
-        { "--key",                      'k', RTGETOPT_REQ_STRING },
-        { "--install-additions",        'A', RTGETOPT_REQ_NOTHING },
-        { "--no-install-additions",     'N', RTGETOPT_REQ_NOTHING },
-        { "--additions-iso",            'a', RTGETOPT_REQ_STRING },
-        { "--install-txs",              't', RTGETOPT_REQ_NOTHING },
-        { "--no-install-txs",           'T', RTGETOPT_REQ_NOTHING },
-        { "--validation-kit-iso",       'K', RTGETOPT_REQ_STRING },
-        { "--auxiliary-base-path",      'x', RTGETOPT_REQ_STRING },
-        { "--image-index",              'm', RTGETOPT_REQ_UINT32 },
-        { "--script-template",          'c', RTGETOPT_REQ_STRING },
-        { "--post-install-template",    'C', RTGETOPT_REQ_STRING },
-        { "--post-install-command",     'P', RTGETOPT_REQ_STRING },
-        { "--session-type",             'S', RTGETOPT_REQ_STRING },
+        { "--iso",                              'i', RTGETOPT_REQ_STRING },
+        { "--user",                             'u', RTGETOPT_REQ_STRING },
+        { "--password",                         'p', RTGETOPT_REQ_STRING },
+        { "--full-user-name",                   'U', RTGETOPT_REQ_STRING },
+        { "--key",                              'k', RTGETOPT_REQ_STRING },
+        { "--install-additions",                'A', RTGETOPT_REQ_NOTHING },
+        { "--no-install-additions",             'N', RTGETOPT_REQ_NOTHING },
+        { "--additions-iso",                    'a', RTGETOPT_REQ_STRING },
+        { "--install-txs",                      't', RTGETOPT_REQ_NOTHING },
+        { "--no-install-txs",                   'T', RTGETOPT_REQ_NOTHING },
+        { "--validation-kit-iso",               'K', RTGETOPT_REQ_STRING },
+        { "--locale",                           'l', RTGETOPT_REQ_STRING },
+        { "--country",                          'L', RTGETOPT_REQ_STRING },
+        { "--time-zone",                        'z', RTGETOPT_REQ_STRING },
+        { "--proxy",                            'y', RTGETOPT_REQ_STRING },
+        { "--auxiliary-base-path",              'x', RTGETOPT_REQ_STRING },
+        { "--image-index",                      'm', RTGETOPT_REQ_UINT32 },
+        { "--script-template",                  'c', RTGETOPT_REQ_STRING },
+        { "--post-install-template",            'C', RTGETOPT_REQ_STRING },
+        { "--post-install-command",             'P', RTGETOPT_REQ_STRING },
+        { "--extra-install-kernel-parameters",  'I', RTGETOPT_REQ_STRING },
+        { "--session-type",                     'S', RTGETOPT_REQ_STRING },
     };
 
@@ -1391 +1401 @@
                 break;
 
+            case 'l':   // --locale
+                pszLocale = ValueUnion.psz;
+                break;
+
+            case 'L':   // --country
+                pszCountry = ValueUnion.psz;
+                break;
+
+            case 'z':   // --time-zone;
+                pszTimeZone = ValueUnion.psz;
+                break;
+
+            case 'y':   // --proxy
+                pszProxy = ValueUnion.psz;
+                break;
+
             case 'x':  // --auxiliary-base-path
                 vrc = RTPathAbsCxx(strAbsAuxiliaryBasePath, ValueUnion.psz);
@@ -1419 +1445 @@
             case 'P':   // --post-install-command.
                 pszPostInstallCommand = ValueUnion.psz;
+                break;
+
+            case 'I':   // --extra-install-kernel-parameters
+                pszExtraInstallKernelParameters = ValueUnion.psz;
                 break;
 
@@ -1505 +1535 @@
             if (fInstallTxs >= 0)
                 CHECK_ERROR_BREAK(ptrUnattended, COMSETTER(InstallTestExecService)(fInstallTxs != (int)false));
+            if (pszLocale)
+                CHECK_ERROR_BREAK(ptrUnattended, COMSETTER(Locale)(Bstr(pszLocale).raw()));
+            if (pszCountry)
+                CHECK_ERROR_BREAK(ptrUnattended, COMSETTER(Country)(Bstr(pszCountry).raw()));
+            if (pszTimeZone)
+                CHECK_ERROR_BREAK(ptrUnattended, COMSETTER(TimeZone)(Bstr(pszTimeZone).raw()));
+            if (pszProxy)
+                CHECK_ERROR_BREAK(ptrUnattended, COMSETTER(Proxy)(Bstr(pszProxy).raw()));
             if (fSetImageIdx)
                 CHECK_ERROR_BREAK(ptrUnattended, COMSETTER(ImageIndex)(idxImage));
@@ -1515 +1553 @@
             if (pszAuxiliaryBasePath)
                 CHECK_ERROR_BREAK(ptrUnattended, COMSETTER(AuxiliaryBasePath)(Bstr(pszAuxiliaryBasePath).raw()));
+            if (pszExtraInstallKernelParameters)
+                CHECK_ERROR_BREAK(ptrUnattended, COMSETTER(ExtraInstallKernelParameters)(Bstr(pszExtraInstallKernelParameters).raw()));
 
             CHECK_ERROR_BREAK(ptrUnattended,Prepare());
@@ -1541 +1581 @@
                 } while (0)
 
-            SHOW_STR_ATTR(IsoPath,                  "isoPath");
-            SHOW_STR_ATTR(User,                     "user");
-            SHOW_STR_ATTR(Password,                 "password");
-            SHOW_STR_ATTR(FullUserName,             "fullUserName");
-            SHOW_STR_ATTR(ProductKey,               "productKey");
-            SHOW_STR_ATTR(AdditionsIsoPath,         "additionsIsoPath");
-            SHOW_ATTR(    InstallGuestAdditions,    "installGuestAdditions",    BOOL, "%RTbool");
-            SHOW_STR_ATTR(ValidationKitIsoPath,     "validationKitIsoPath");
-            SHOW_ATTR(    InstallTestExecService,   "installTestExecService",   BOOL, "%RTbool");
-            SHOW_STR_ATTR(AuxiliaryBasePath,        "auxiliaryBasePath");
-            SHOW_ATTR(    ImageIndex,               "imageIndex",               ULONG, "%u");
-            SHOW_STR_ATTR(ScriptTemplatePath,       "scriptTemplatePath");
+            SHOW_STR_ATTR(IsoPath,                       "isoPath");
+            SHOW_STR_ATTR(User,                          "user");
+            SHOW_STR_ATTR(Password,                      "password");
+            SHOW_STR_ATTR(FullUserName,                  "fullUserName");
+            SHOW_STR_ATTR(ProductKey,                    "productKey");
+            SHOW_STR_ATTR(AdditionsIsoPath,              "additionsIsoPath");
+            SHOW_ATTR(    InstallGuestAdditions,         "installGuestAdditions",    BOOL, "%RTbool");
+            SHOW_STR_ATTR(ValidationKitIsoPath,          "validationKitIsoPath");
+            SHOW_ATTR(    InstallTestExecService,        "installTestExecService",   BOOL, "%RTbool");
+            SHOW_STR_ATTR(Locale,                        "locale");
+            SHOW_STR_ATTR(Country,                       "country");
+            SHOW_STR_ATTR(TimeZone,                      "timeZone");
+            SHOW_STR_ATTR(Proxy,                         "proxy");
+            SHOW_STR_ATTR(AuxiliaryBasePath,             "auxiliaryBasePath");
+            SHOW_ATTR(    ImageIndex,                    "imageIndex",               ULONG, "%u");
+            SHOW_STR_ATTR(ScriptTemplatePath,            "scriptTemplatePath");
             SHOW_STR_ATTR(PostInstallScriptTemplatePath, "postInstallScriptTemplatePath");
-            SHOW_STR_ATTR(PostInstallCommand,       "postInstallCommand");
+            SHOW_STR_ATTR(PostInstallCommand,            "postInstallCommand");
+            SHOW_STR_ATTR(ExtraInstallKernelParameters,  "extraInstallKernelParameters");
+            SHOW_STR_ATTR(DetectedOSTypeId,              "detectedOSTypeId");
+            SHOW_STR_ATTR(DetectedOSVersion,             "detectedOSVersion");
+            SHOW_STR_ATTR(DetectedOSFlavor,              "detectedOSFlavor");
+            SHOW_STR_ATTR(DetectedOSHints,               "detectedOSHints");
 
 #undef SHOW_STR_ATTR