Changeset 68071 in vbox for trunk/src/VBox/Frontends/VBoxManage

Timestamp:

Jul 20, 2017 4:24:08 PM (8 years ago)

Author:

vboxsync

Message:

Unattended: Split out the post installation script into a separate file. Dropped the IUnattended::loadSettings method, don't see much point. Simplified the script editor classes, moving the default filenames and templates to the installer constructor, allowing us to avoid having to 'new' the script editors. The editors are now direct members of UnattendedInstaller.

File:

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

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

@@ -1286 +1286 @@
     int         fInstallTxs             = -1;
     const char *pszMachineName          = NULL;
-    Utf8Str     strAbsSettingsFile;
-    const char *pszSettingsFile         = NULL;
     bool        fSetImageIdx            = false;
     uint32_t    idxImage                = 0;
@@ -1295 +1293 @@
     Utf8Str     strAbsScriptTemplatePath;
     const char *pszScriptTemplatePath   = NULL;
+    Utf8Str     strAbsPostInstallScriptTemplatePath;
+    const char *pszPostInstallScriptTemplatePath = NULL;
     const char *pszSessionType          = "headless";
 
@@ -1319 +1319 @@
         { "--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 },
-        { "--settings-file",            's', RTGETOPT_REQ_STRING },
         { "--session-type",             'S', RTGETOPT_REQ_STRING },
     };
@@ -1342 +1342 @@
                 break;
 
-            case 's':   // --settings-file <key value file>
-                vrc = RTPathAbsCxx(strAbsSettingsFile, ValueUnion.psz);
-                if (RT_FAILURE(vrc))
-                    return errorSyntax(USAGE_UNATTENDEDINSTALL, "RTPathAbsCxx failed on '%s': %Rrc", ValueUnion.psz, vrc);
-                pszSettingsFile = strAbsSettingsFile.c_str();
-                break;
-
             case 'i':   // --iso
                 vrc = RTPathAbsCxx(strAbsIsoPath, ValueUnion.psz);
@@ -1417 +1410 @@
                 break;
 
+            case 'C':  // --post-install-script-template
+                vrc = RTPathAbsCxx(strAbsPostInstallScriptTemplatePath, ValueUnion.psz);
+                if (RT_FAILURE(vrc))
+                    return errorSyntax(USAGE_UNATTENDEDINSTALL, "RTPathAbsCxx failed on '%s': %Rrc", ValueUnion.psz, vrc);
+                pszPostInstallScriptTemplatePath = strAbsPostInstallScriptTemplatePath.c_str();
+                break;
+
             case 'P':   // --post-install-command.
                 pszPostInstallCommand = ValueUnion.psz;
@@ -1436 +1436 @@
         return errorSyntax(USAGE_UNATTENDEDINSTALL, "Missing VM name/UUID");
 
-    if (!pszSettingsFile && !pszIsoPath)
-        return errorSyntax(USAGE_UNATTENDEDINSTALL, "Missing required --iso (or --settings-file) option");
+    if (!pszIsoPath)
+        return errorSyntax(USAGE_UNATTENDEDINSTALL, "Missing required --iso option");
 
     /*
@@ -1486 +1486 @@
             ComPtr<IUnattended> ptrUnattended;
             CHECK_ERROR_BREAK(machine, CreateUnattendedInstaller(ptrUnattended.asOutParam()));
-
-            if (pszSettingsFile)
-                CHECK_ERROR_BREAK(ptrUnattended, LoadSettings(Bstr(pszSettingsFile).raw()));
 
             if (pszIsoPath)
@@ -1512 +1509 @@
             if (pszScriptTemplatePath)
                 CHECK_ERROR_BREAK(ptrUnattended, COMSETTER(ScriptTemplatePath)(Bstr(pszScriptTemplatePath).raw()));
+            if (pszPostInstallScriptTemplatePath)
+                CHECK_ERROR_BREAK(ptrUnattended, COMSETTER(PostInstallScriptTemplatePath)(Bstr(pszPostInstallScriptTemplatePath).raw()));
             if (pszPostInstallCommand)
                 CHECK_ERROR_BREAK(ptrUnattended, COMSETTER(PostInstallCommand)(Bstr(pszPostInstallCommand).raw()));
@@ -1529 +1528 @@
                     HRESULT hrc2 = ptrUnattended->COMGETTER(a_Attr)(&Value); \
                     if (SUCCEEDED(hrc2)) \
-                        RTPrintf("  %22s = " a_szFmt "\n", a_szText, Value); \
+                        RTPrintf("  %32s = " a_szFmt "\n", a_szText, Value); \
                     else \
-                        RTPrintf("  %22s = failed: %Rhrc\n", a_szText, hrc2); \
+                        RTPrintf("  %32s = failed: %Rhrc\n", a_szText, hrc2); \
                 } while (0)
 #define SHOW_STR_ATTR(a_Attr, a_szText) do { \
@@ -1537 +1536 @@
                     HRESULT hrc2 = ptrUnattended->COMGETTER(a_Attr)(bstrString.asOutParam()); \
                     if (SUCCEEDED(hrc2)) \
-                        RTPrintf("  %22s = %ls\n", a_szText, bstrString.raw()); \
+                        RTPrintf("  %32s = %ls\n", a_szText, bstrString.raw()); \
                     else \
-                        RTPrintf("  %22s = failed: %Rhrc\n", a_szText, hrc2); \
+                        RTPrintf("  %32s = failed: %Rhrc\n", a_szText, hrc2); \
                 } while (0)
 
@@ -1554 +1553 @@
             SHOW_ATTR(    ImageIndex,               "imageIndex",               ULONG, "%u");
             SHOW_STR_ATTR(ScriptTemplatePath,       "scriptTemplatePath");
+            SHOW_STR_ATTR(PostInstallScriptTemplatePath, "postInstallScriptTemplatePath");
             SHOW_STR_ATTR(PostInstallCommand,       "postInstallCommand");