Changeset 102116 in vbox

Timestamp:

Nov 15, 2023 7:41:58 PM (15 months ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

160237

Message:

Main/Unattended: added user payload to unattended. bugref:10446

Location:

trunk/src/VBox/Main

Files:

• idl/VirtualBox.xidl (modified) (2 diffs)
• include/UnattendedImpl.h (modified) (3 diffs)
• include/UnattendedInstaller.h (modified) (1 diff)
• src-server/UnattendedImpl.cpp (modified) (4 diffs)
• src-server/UnattendedInstaller.cpp (modified) (2 diffs)
• testcase/tstUnattendedScript.cpp (modified) (1 diff)

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -4962 +4962 @@
   <interface
     name="IUnattended" extends="$unknown"
-    uuid="6f89464f-7773-436a-a4df-592e4e537fa0"
+    uuid="d1833215-78c9-4b42-9c2a-f44ef7b2d01f"
     wsmap="managed"
     rest="managed"
@@ -5069 +5069 @@
         The TXS binary will be taken from the ISO indicated by
         <link to="IUnattended::validationKitIsoPath"/>.
+      </desc>
+    </attribute>
+
+    <attribute name="userPayloadIsoPath" type="wstring">
+      <desc>
+        User Payload ISO image path.  This is used when
+        <link to="IUnattended::installUserPayload"/> is set to true.
+      </desc>
+    </attribute>
+
+    <attribute name="installUserPayload" type="boolean">
+      <desc>
+        Indicates whether the User Payload should be installed or not.
+
+        The User Payload will be taken from the ISO indicated by
+        <link to="IUnattended::userPayloadIsoPath"/>.
       </desc>
     </attribute>

trunk/src/VBox/Main/include/UnattendedImpl.h

@@ -89 +89 @@
     Utf8Str const &i_getValidationKitIsoPath() const;
     bool           i_getInstallTestExecService() const;
+    Utf8Str const &i_getUserPayloadIsoPath() const;
+    bool           i_getInstallUserPayload() const;
     Utf8Str const &i_getTimeZone() const;
     PCRTTIMEZONEINFO i_getTimeZoneInfo() const;
@@ -135 +137 @@
     bool            mfInstallTestExecService;
     Utf8Str         mStrValidationKitIsoPath;
+    Utf8Str         mStrUserPayloadIsoPath;
+    bool            mfInstallUserPayload;
     Utf8Str         mStrTimeZone;
     PCRTTIMEZONEINFO mpTimeZoneInfo;
@@ -209 +213 @@
     HRESULT getInstallTestExecService(BOOL *aInstallTestExecService);
     HRESULT setInstallTestExecService(BOOL aInstallTestExecService);
+    HRESULT getUserPayloadIsoPath(com::Utf8Str &aUserPayloadIsoPath);
+    HRESULT setUserPayloadIsoPath(const com::Utf8Str &aUserPayloadIsoPath);
+    HRESULT getInstallUserPayload(BOOL *aInstallUserPayload);
+    HRESULT setInstallUserPayload(BOOL aInstallUserPayload);
     HRESULT getTimeZone(com::Utf8Str &aTimezone);
     HRESULT setTimeZone(const com::Utf8Str &aTimezone);

trunk/src/VBox/Main/include/UnattendedInstaller.h

@@ -342 +342 @@
      *
      * The base class implementation adds the script from mAlg, additions ISO
-     * content to '/vboxadditions', and validation kit ISO to '/vboxvalidationkit'.
+     * content to '/vboxadditions', validation kit ISO to '/vboxvalidationkit',
+     * and user payload ISO to '/vboxuserpayload'.
      *
      * @returns COM status code.

trunk/src/VBox/Main/src-server/UnattendedImpl.cpp

@@ -318 +318 @@
         mfInstallGuestAdditions     = false;
         mfInstallTestExecService    = false;
+        mfInstallUserPayload        = false;
         midxImage                   = 1;
 
@@ -2570 +2571 @@
         return setErrorBoth(E_FAIL, VERR_FILE_NOT_FOUND, tr("Could not locate the validation kit ISO file '%s'"),
                             mStrValidationKitIsoPath.c_str());
+    if (mfInstallUserPayload && !RTFileExists(mStrUserPayloadIsoPath.c_str()))
+        return setErrorBoth(E_FAIL, VERR_FILE_NOT_FOUND, tr("Could not locate the User Payload ISO file '%s'"),
+                            mStrUserPayloadIsoPath.c_str());
     if (mStrScriptTemplatePath.isNotEmpty() && !RTFileExists(mStrScriptTemplatePath.c_str()))
         return setErrorBoth(E_FAIL, VERR_FILE_NOT_FOUND, tr("Could not locate unattended installation script template '%s'"),
@@ -3522 +3526 @@
     AssertReturn(mpInstaller == NULL, setErrorBoth(E_FAIL, VERR_WRONG_ORDER, tr("Cannot change after prepare() has been called")));
     mfInstallTestExecService = aInstallTestExecService != FALSE;
+    return S_OK;
+}
+
+HRESULT Unattended::getUserPayloadIsoPath(com::Utf8Str &aUserPayloadIsoPath)
+{
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+    aUserPayloadIsoPath = mStrUserPayloadIsoPath;
+    return S_OK;
+}
+
+HRESULT Unattended::setUserPayloadIsoPath(const com::Utf8Str &aUserPayloadIsoPath)
+{
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+    AssertReturn(mpInstaller == NULL, setErrorBoth(E_FAIL, VERR_WRONG_ORDER, tr("Cannot change after prepare() has been called")));
+    mStrUserPayloadIsoPath = aUserPayloadIsoPath;
+    return S_OK;
+}
+
+HRESULT Unattended::getInstallUserPayload(BOOL *aInstallUserPayload)
+{
+    AutoReadLock alock(this COMMA_LOCKVAL_SRC_POS);
+    *aInstallUserPayload = mfInstallUserPayload;
+    return S_OK;
+}
+
+HRESULT Unattended::setInstallUserPayload(BOOL aInstallUserPayload)
+{
+    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+    AssertReturn(mpInstaller == NULL, setErrorBoth(E_FAIL, VERR_WRONG_ORDER, tr("Cannot change after prepare() has been called")));
+    mfInstallUserPayload = aInstallUserPayload != FALSE;
     return S_OK;
 }
@@ -4098 +4132 @@
 }
 
+Utf8Str const &Unattended::i_getUserPayloadIsoPath() const
+{
+    Assert(isReadLockedOnCurrentThread());
+    return mStrUserPayloadIsoPath;
+}
+
+bool           Unattended::i_getInstallUserPayload() const
+{
+    Assert(isReadLockedOnCurrentThread());
+    return mfInstallUserPayload;
+}
+
 Utf8Str const &Unattended::i_getTimeZone() const
 {

trunk/src/VBox/Main/src-server/UnattendedInstaller.cpp

@@ -256 +256 @@
 bool UnattendedInstaller::isAuxiliaryIsoNeeded() const
 {
-    /* In the VISO case we use the AUX ISO for GAs and TXS. */
+    /* In the VISO case we use the AUX ISO for GAs, TXS, and User Payloads. */
     return isAuxiliaryIsoIsVISO()
         && (   mpParent->i_getInstallGuestAdditions()
-            || mpParent->i_getInstallTestExecService());
+            || mpParent->i_getInstallTestExecService()
+            || mpParent->i_getInstallUserPayload());
 }
 
@@ -755 +756 @@
                 rVecArgs.append().append("--push-iso=").append(mpParent->i_getValidationKitIsoPath());
                 rVecArgs.append() = "/vboxvalidationkit=/";
+                rVecArgs.append() = "--pop";
+            }
+
+            /*
+             * If we've got a User Payload ISO, add its content to a /vboxuserpayload dir.
+             */
+            if (mpParent->i_getInstallUserPayload())
+            {
+                rVecArgs.append().append("--push-iso=").append(mpParent->i_getUserPayloadIsoPath());
+                rVecArgs.append() = "/vboxuserpayload=/";
                 rVecArgs.append() = "--pop";
             }

trunk/src/VBox/Main/testcase/tstUnattendedScript.cpp

@@ -250 +250 @@
 }
 
+HRESULT Unattended::getUserPayloadIsoPath(com::Utf8Str &userPayloadIsoPath)
+{
+    RT_NOREF(userPayloadIsoPath);
+    return E_NOTIMPL;
+}
+
+HRESULT Unattended::setUserPayloadIsoPath(const com::Utf8Str &userPayloadIsoPath)
+{
+    RT_NOREF(userPayloadIsoPath);
+    return E_NOTIMPL;
+}
+
+HRESULT Unattended::getInstallUserPayload(BOOL *installUserPayload)
+{
+    RT_NOREF(installUserPayload);
+    return E_NOTIMPL;
+}
+
+HRESULT Unattended::setInstallUserPayload(BOOL installUserPayload)
+{
+    RT_NOREF(installUserPayload);
+    return E_NOTIMPL;
+}
+
 HRESULT Unattended::getTimeZone(com::Utf8Str &aTimeZone)
 {