Changeset 68222 in vbox for trunk/src/VBox/Main/include/UnattendedInstaller.h

Timestamp:

Aug 1, 2017 7:05:50 PM (8 years ago)

Author:

vboxsync

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

117326

Message:

Main: Squeeze the validation kit and additions onto the aux image when installing windows vista+. Implemented setting up vboxtxs.

File:

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

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

@@ -110 +110 @@
     virtual HRESULT initInstaller();
 
+#if 0 /* These are now in the AUX VISO. */
     /**
      * Whether the VBox guest additions ISO is needed or not.
@@ -125 +126 @@
      */
     virtual bool isValidationKitIsoNeeded() const;
+#endif
 
     /**
@@ -139 +141 @@
      * Indicates whether an additional or replacement ISO image is needed or not.
      */
-    virtual bool isAuxiliaryIsoNeeded() const       { return false; }
+    virtual bool isAuxiliaryIsoNeeded() const;
+
+    /**
+     * Indicates whether we should boot from the auxiliary ISO image.
+     *
+     * Will boot from installation ISO if false.
+     */
+    virtual bool bootFromAuxiliaryIso() const       { return isAuxiliaryIsoNeeded(); }
 
     /**
@@ -149 +158 @@
      * be remastered with small changes and additions.
      */
-    virtual bool isAuxiliaryIsoIsVISO() const       { return false; }
+    virtual bool isAuxiliaryIsoIsVISO() const       { return true; }
 
     /*
@@ -355 +364 @@
         : UnattendedInstaller(pParent,
                               "win_nt5_unattended.sif", "win_postinstall.cmd",
-                              "WINNT.SIF",              "vboxpostinstall.cmd")
-    { Assert(isOriginalIsoNeeded()); Assert(isAuxiliaryFloppyNeeded());  Assert(!isAuxiliaryIsoNeeded()); }
+                              "WINNT.SIF",              "VBOXPOST.CMD")
+    { Assert(isOriginalIsoNeeded()); Assert(isAuxiliaryFloppyNeeded()); Assert(isAuxiliaryIsoIsVISO()); Assert(!bootFromAuxiliaryIso()); }
     ~UnattendedWindowsSifInstaller()        {}
 
     bool isAuxiliaryFloppyNeeded() const    { return true; }
+    bool bootFromAuxiliaryIso() const       { return false; }
+
 };
 
@@ -371 +382 @@
         : UnattendedInstaller(pParent,
                               "win_nt6_unattended.xml", "win_postinstall.cmd",
-                              "autounattend.xml",       "vboxpostinstall.cmd")
-    { Assert(isOriginalIsoNeeded()); Assert(isAuxiliaryFloppyNeeded());  Assert(!isAuxiliaryIsoNeeded()); }
+                              "autounattend.xml",       "VBOXPOST.CMD")
+    { Assert(isOriginalIsoNeeded()); Assert(isAuxiliaryFloppyNeeded()); Assert(isAuxiliaryIsoIsVISO()); Assert(!bootFromAuxiliaryIso()); }
     ~UnattendedWindowsXmlInstaller()      {}
 
     bool isAuxiliaryFloppyNeeded() const    { return true; }
+    bool bootFromAuxiliaryIso() const       { return false; }
 };
 
@@ -399 +411 @@
 
     bool isAuxiliaryIsoNeeded() const       { return true; }
-    bool isAuxiliaryIsoIsVISO() const       { return true; }
 
 protected: