Changeset 92768 in vbox

Timestamp:

Dec 6, 2021 3:29:22 PM (3 years ago)

Author:

vboxsync

Message:

Main/Unattended: Fix creation of auxiliary VISO for Windows install.

File:

• trunk/src/VBox/Main/include/UnattendedInstaller.h (modified) (2 diffs)

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

@@ -406 +406 @@
                               "autounattend.xml",       "VBOXPOST.CMD")
     {
-        Assert(isOriginalIsoNeeded()); Assert(isAuxiliaryFloppyNeeded() != isAuxiliaryIsoNeeded()); Assert(isAuxiliaryIsoIsVISO()); Assert(!bootFromAuxiliaryIso());
+        Assert(isOriginalIsoNeeded()); Assert(isAuxiliaryFloppyNeeded() || isAuxiliaryIsoNeeded()); Assert(isAuxiliaryIsoIsVISO()); Assert(!bootFromAuxiliaryIso());
         if (isAuxiliaryFloppyNeeded())
             mStrAuxiliaryInstallDir = "A:\\";
@@ -417 +417 @@
 
     bool isAuxiliaryFloppyNeeded() const    { return !mpParent->i_isFirmwareEFI(); }
-    bool isAuxiliaryIsoNeeded() const       { return mpParent->i_isFirmwareEFI(); }
+    bool isAuxiliaryIsoNeeded() const       { return UnattendedInstaller::isAuxiliaryIsoNeeded() || mpParent->i_isFirmwareEFI(); }
     bool isAuxiliaryIsoIsVISO() const       { return true; }
     bool bootFromAuxiliaryIso() const       { return false; }