Changeset 107968 in vbox for trunk/src/VBox/Main

Timestamp:

Jan 28, 2025 3:15:18 PM (3 weeks ago)

Author:

vboxsync

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

167220

Message:

Main: Marked the ARM64-based Linux Guest Additions installer optional in the automatic Guest Additions Updater code. This makes it possible to test (failing) older Guest Additions which don't support ARM64 on ARM64 guests. bugref:10734

File:

• trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp (modified) (1 diff)

trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp

@@ -3321 +3321 @@
                         case eOSType_Linux:
                         {
-                            bool fIsArm = getPlatformArch() == PlatformArchitecture_ARM;
+                            bool const fIsArm = getPlatformArch() == PlatformArchitecture_ARM;
 
                             const Utf8Str strInstallerBinUC("VBOXLINUXADDITIONS" + Utf8Str(fIsArm ? "-ARM64" : "") + ".RUN");
                             const Utf8Str strInstallerBin  ("VBoxLinuxAdditions" + Utf8Str(fIsArm ? "-arm64" : "") + ".run");
 
-                            /* Copy over the installer to the guest but don't execute it.
-                             * Execution will be done by the shell instead. */
-                            mFiles.push_back(ISOFile(strInstallerBinUC, strUpdateDir + strInstallerBin, ISOFILE_FLAG_COPY_FROM_ISO));
+                            /**
+                             * Copy over the installer to the guest but don't execute it.
+                             * Execution will be done by the shell instead.
+                             *
+                             * Note: Guest Additions for ARM64 don't exist on older Guest Additions .ISOs,
+                             *       so mark them as optional.
+                             */
+                            mFiles.push_back(ISOFile(strInstallerBinUC, strUpdateDir + strInstallerBin,
+                                                       ISOFILE_FLAG_COPY_FROM_ISO
+                                                     | fIsArm ? ISOFILE_FLAG_OPTIONAL : ISOFILE_FLAG_NONE));
 
                             UpdateAdditionsStartupInfo siInstaller;