Changeset 102347 in vbox

Timestamp:

Nov 27, 2023 6:55:29 PM (12 months ago)

Author:

vboxsync

Message:

Main/Unattended: Added support for Ubuntu Server >= 20.04. bugref:10551

Location:

trunk/src/VBox/Main/src-server

Files:

• UnattendedImpl.cpp (modified) (1 diff)
• UnattendedInstaller.cpp (modified) (1 diff)

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

@@ -1883 +1883 @@
      *   Official Debian GNU/Linux Live 10.10.0 cinnamon 2021-06-19T12:13
      *   Ubuntu 23.10.1 "Mantic Minotaur" - Release amd64 (20231016.1)
+     *   Ubuntu-Server 22.04.3 LTS "Jammy Jellyfish" - Release amd64 (20230810)
      */
     vrc = RTVfsFileOpen(hVfsIso, ".disk/info", RTFILE_O_READ | RTFILE_O_DENY_NONE | RTFILE_O_OPEN, &hVfsFile);

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

@@ -93 +93 @@
              * - The autoinstall installer for newer Ubuntu desktop or Ubuntu server versions.
              */
-            if (RTStrVersionCompare(strDetectedOSVersion.c_str(), "22.10") >= 0)
+            if (/* Ubuntu Desktop >= 22.10 switch to the autoinstall installer. */
+                   RTStrVersionCompare(strDetectedOSVersion.c_str(), "22.10") >= 0
+                /* Ubuntu Server >= 20.04 also uses autoinstall installer. Before that no unattended installation was possible. */
+                || (   RTStrVersionCompare(strDetectedOSVersion.c_str(), "20.04") >= 0
+                    && strDetectedOSFlavor.contains("Server", RTCString::CaseSensitivity::CaseSensitive))
+               )
                 pUinstaller = new UnattendedUbuntuAutoInstallInstaller(pParent);
-                /// @todo Check for Server >= 20.04 and others.
             else
                 pUinstaller = new UnattendedUbuntuPreseedInstaller(pParent);