Changeset 86270 in vbox for trunk/src/VBox/Main/src-server

Timestamp:

Sep 24, 2020 4:05:49 PM (4 years ago)

Author:

vboxsync

Message:

bugref:8527. Added the separate classes for RHEL7/8, OL7/8.

File:

• trunk/src/VBox/Main/src-server/UnattendedInstaller.cpp (modified) (3 diffs)

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

@@ -74 +74 @@
         else if (enmOsType >= VBOXOSTYPE_RedHat && enmOsType <= VBOXOSTYPE_RedHat_x64)
         {
-            if (   strDetectedOSVersion.isEmpty()
-                || RTStrVersionCompare(strDetectedOSVersion.c_str(), "6") >= 0)
-                pUinstaller = new UnattendedRhel6And7Installer(pParent);
+            if (RTStrVersionCompare(strDetectedOSVersion.c_str(), "8") >= 0)
+                pUinstaller = new UnattendedRhel8Installer(pParent);
+            else if (RTStrVersionCompare(strDetectedOSVersion.c_str(), "7") >= 0)
+                pUinstaller = new UnattendedRhel7Installer(pParent);
+            else if (RTStrVersionCompare(strDetectedOSVersion.c_str(), "6") >= 0)
+                pUinstaller = new UnattendedRhel6Installer(pParent);
             else if (RTStrVersionCompare(strDetectedOSVersion.c_str(), "5") >= 0)
                 pUinstaller = new UnattendedRhel5Installer(pParent);
@@ -84 +87 @@
                 pUinstaller = new UnattendedRhel3Installer(pParent);
             else
-                pUinstaller = new UnattendedRhel6And7Installer(pParent);
+                pUinstaller = new UnattendedRhel6Installer(pParent);
         }
         else if (enmOsType >= VBOXOSTYPE_FedoraCore && enmOsType <= VBOXOSTYPE_FedoraCore_x64)
             pUinstaller = new UnattendedFedoraInstaller(pParent);
         else if (enmOsType >= VBOXOSTYPE_Oracle && enmOsType <= VBOXOSTYPE_Oracle_x64)
-            pUinstaller = new UnattendedOracleLinuxInstaller(pParent);
+        {
+            if (RTStrVersionCompare(strDetectedOSVersion.c_str(), "8") >= 0)
+                pUinstaller = new UnattendedOracleLinux8Installer(pParent);
+            else if (RTStrVersionCompare(strDetectedOSVersion.c_str(), "7") >= 0)
+                pUinstaller = new UnattendedOracleLinux7Installer(pParent);
+            else if (RTStrVersionCompare(strDetectedOSVersion.c_str(), "6") >= 0)
+                pUinstaller = new UnattendedOracleLinux6Installer(pParent);
+            else
+                pUinstaller = new UnattendedOracleLinux6Installer(pParent);
+        }
 #if 0 /* doesn't work, so convert later. */
         else if (enmOsType == VBOXOSTYPE_OpenSUSE || enmOsType == VBOXOSTYPE_OpenSUSE_x64)
@@ -1077 +1089 @@
 *
 *
-*  Implementation UnattendedRhel6And7Installer functions
+*  Implementation UnattendedRhel6Installer functions
 *
 */
 //////////////////////////////////////////////////////////////////////////////////////////////////////
-HRESULT UnattendedRhel6And7Installer::addFilesToAuxVisoVectors(RTCList<RTCString> &rVecArgs, RTCList<RTCString> &rVecFiles,
+HRESULT UnattendedRhel6Installer::addFilesToAuxVisoVectors(RTCList<RTCString> &rVecArgs, RTCList<RTCString> &rVecFiles,
                                                                RTVFS hVfsOrgIso, bool fOverwrite)
 {