Changeset 93157 in vbox for trunk

Timestamp:

Jan 9, 2022 1:30:49 PM (3 years ago)

Author:

vboxsync

Message:

Main/Unattended: Made the OS/2 detection code return S_OK instead of S_FALSE for ACP2.

File:

• trunk/src/VBox/Main/src-server/UnattendedImpl.cpp (modified) (2 diffs)

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

@@ -299 +299 @@
 
         RTVfsRelease(hVfsIso);
-        hrc = E_NOTIMPL;
+        if (hrc != S_FALSE) /** @todo Finish the linux and windows detection code. Only OS/2 returns S_OK right now. */
+            hrc = E_NOTIMPL;
     }
     else if (RTErrInfoIsSet(&ErrInfo.Core))
@@ -1502 +1503 @@
     /** @todo language detection? */
 
-    /** @todo Return true if we can actually do an unattended installation
-     *        using this ISO.  So far, we cannot from any OS/2 image. */
+    /*
+     * Only tested ACP2, so only return S_OK for it.
+     */
+    if (   *penmOsType == VBOXOSTYPE_OS2Warp45
+        && RTStrVersionCompare(mStrDetectedOSVersion.c_str(), "4.52") >= 0
+        && mStrDetectedOSFlavor.contains("Server", RTCString::CaseInsensitive))
+        return S_OK;
+
     return S_FALSE;
 }