Changeset 101685 in vbox

Timestamp:

Oct 31, 2023 12:40:20 PM (15 months ago)

Author:

vboxsync

Message:

Main/Unattended|GuestOSType: Add an entry in the guest OS type to indicate the name of the additions install package instead of hardcoding it in the templates. Allows easy adaption if something changes and makes it possible to auto install guest additions for linux.arm64 guests, bugref:10542 [missing files]

Location:

trunk/src/VBox/Main

Files:

• include/GuestOSTypeImpl.h (modified) (2 diffs)
• src-server/UnattendedInstaller.cpp (modified) (3 diffs)

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

@@ -108 +108 @@
     HRESULT getRecommendedSecureBoot(BOOL *aRecommendedSecureBoot);
     HRESULT getRecommendedWDDMGraphics(BOOL *aRecommendedWDDMGraphics);
+    HRESULT getGuestAdditionsInstallPackageName(com::Utf8Str &aGuestAdditionsInstallPkgName);
 
 
@@ -115 +116 @@
     const Utf8Str mID;
     const Utf8Str mDescription;
+    const Utf8Str mGuestAdditionsInstallPackageName;
     const VBOXOSTYPE mOSType;
     const uint32_t mOSHint;

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

@@ -82 +82 @@
                 || enmDetectedOSType <= VBOXOSTYPE_Debian_latest_arm64))
             pUinstaller = new UnattendedDebianInstaller(pParent);
-        else if (enmDetectedOSType >= VBOXOSTYPE_Ubuntu && enmDetectedOSType <= VBOXOSTYPE_Ubuntu_latest_x64)
+        else if (   enmDetectedOSType >= VBOXOSTYPE_Ubuntu
+                 && (   enmDetectedOSType <= VBOXOSTYPE_Ubuntu_latest_x64
+                     || enmDetectedOSType <= VBOXOSTYPE_Ubuntu_latest_arm64))
             pUinstaller = new UnattendedUbuntuInstaller(pParent);
         else if (enmDetectedOSType >= VBOXOSTYPE_RedHat && enmDetectedOSType <= VBOXOSTYPE_RedHat_latest_x64)
@@ -103 +105 @@
         else if (enmDetectedOSType >= VBOXOSTYPE_FedoraCore && enmDetectedOSType <= VBOXOSTYPE_FedoraCore_x64)
             pUinstaller = new UnattendedFedoraInstaller(pParent);
-        else if (enmDetectedOSType >= VBOXOSTYPE_Oracle && enmDetectedOSType <= VBOXOSTYPE_Oracle_latest_x64)
+        else if (   enmDetectedOSType >= VBOXOSTYPE_Oracle
+                 && (   enmDetectedOSType <= VBOXOSTYPE_Oracle_latest_x64
+                     || enmDetectedOSType <= VBOXOSTYPE_Oracle_latest_arm64))
         {
             if (RTStrVersionCompare(strDetectedOSVersion.c_str(), "9") >= 0)
@@ -116 +120 @@
                 pUinstaller = new UnattendedOracleLinux6Installer(pParent);
         }
-        else if (enmDetectedOSType >= VBOXOSTYPE_FreeBSD && enmDetectedOSType <= VBOXOSTYPE_FreeBSD_x64)
+        else if (   enmDetectedOSType >= VBOXOSTYPE_FreeBSD
+                 && (   enmDetectedOSType <= VBOXOSTYPE_FreeBSD_x64
+                     || enmDetectedOSType <= VBOXOSTYPE_FreeBSD_arm64))
             pUinstaller = new UnattendedFreeBsdInstaller(pParent);
 #if 0 /* doesn't work, so convert later. */