Changeset 96721 in vbox

Timestamp:

Sep 13, 2022 2:12:23 PM (3 years ago)

Author:

vboxsync

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

153606

Message:

Unattended: bugref:9781. Using the first part of the read disk name string as OS flavor and black listing newer lubuntus.

File:

• trunk/src/VBox/Main/src-server/UnattendedImpl.cpp (modified) (7 diffs)

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

@@ -1486 +1486 @@
 }
 
+
+/**
+ * Helps detecting linux distro flavor by finding substring position of non numerical
+ * part of the disk name.
+ *
+ * @returns true if detected, false if not.
+ * @param   pszDiskName          Name of the disk as it is read from .disk/info or README.diskdefines file.
+ * @param   cchVersionPosition   String position where first numerical character is found. We use substring upto this position as OS flavor
+ */
+static bool detectLinuxDistroFlavor(const char *pszDiskName, size_t *cchVersionPosition)
+{
+    if (!pszDiskName || !cchVersionPosition)
+        return false;
+    while (*pszDiskName != '\0' && !RT_C_IS_DIGIT(*pszDiskName))
+    {
+        ++pszDiskName;
+        ++(*cchVersionPosition);
+    }
+    return true;
+}
+
 /**
  * Detect Linux distro ISOs.
@@ -1553 +1574 @@
                         try { mStrDetectedOSVersion = RTStrStrip(pBuf->sz); }
                         catch (std::bad_alloc &) { return E_OUTOFMEMORY; }
+
+                        size_t cchVersionPosition = 0;
+                        if (detectLinuxDistroFlavor(pBuf->sz, &cchVersionPosition))
+                        {
+                            try { mStrDetectedOSFlavor = Utf8Str(pBuf->sz, cchVersionPosition); }
+                            catch (std::bad_alloc &) { return E_OUTOFMEMORY; }
+                        }
                     }
                 }
@@ -1685 +1713 @@
                 }
             }
+            size_t cchVersionPosition = 0;
+            if (detectLinuxDistroFlavor(apszLines[1], &cchVersionPosition))
+            {
+                try { mStrDetectedOSFlavor = Utf8Str(apszLines[1], cchVersionPosition); }
+                catch (std::bad_alloc &) { return E_OUTOFMEMORY; }
+            }
         }
         else
@@ -1694 +1728 @@
 
     /*
-     * Ubuntu has a README.diskdefins file on their ISO (already on 4.10 / warty warthog).
+     * Ubuntu has a README.diskdefines file on their ISO (already on 4.10 / warty warthog).
      * Example content:
      *  #define DISKNAME  Ubuntu 4.10 "Warty Warthog" - Preview amd64 Binary-1
@@ -1788 +1822 @@
                     try { mStrDetectedOSVersion = RTStrStripL(pszVersion); }
                     catch (std::bad_alloc &) { return E_OUTOFMEMORY; }
+
+                    size_t cchVersionPosition = 0;
+                    if (detectLinuxDistroFlavor(pszDiskName, &cchVersionPosition))
+                    {
+                        try { mStrDetectedOSFlavor = Utf8Str(pszDiskName, cchVersionPosition); }
+                        catch (std::bad_alloc &) { return E_OUTOFMEMORY; }
+                    }
                 }
                 else
@@ -1871 +1912 @@
                 try { mStrDetectedOSVersion = RTStrStripL(pszVersion); }
                 catch (std::bad_alloc &) { return E_OUTOFMEMORY; }
+
+                size_t cchVersionPosition = 0;
+                if (detectLinuxDistroFlavor(pszDiskName, &cchVersionPosition))
+                {
+                    try { mStrDetectedOSFlavor = Utf8Str(pszDiskName, cchVersionPosition); }
+                    catch (std::bad_alloc &) { return E_OUTOFMEMORY; }
+                }
             }
             else
@@ -3772 +3820 @@
         return S_OK;
 
-    /* We cannot install Ubuntus older than 11.04. */
-    if (   enmOsTypeMasked == VBOXOSTYPE_Ubuntu
-        && RTStrVersionCompare(mStrDetectedOSVersion.c_str(), "11.04") < 0)
-        return S_OK;
+    if (enmOsTypeMasked == VBOXOSTYPE_Ubuntu)
+    {
+        /* We cannot install Ubuntus older than 11.04. */
+        if (RTStrVersionCompare(mStrDetectedOSVersion.c_str(), "11.04") < 0)
+            return S_OK;
+        /* Lubuntu, starting with 20.04, has switched to calamares, which cannot be automated. */
+        if (   RTStrIStr(mStrDetectedOSFlavor.c_str(), "lubuntu")
+            && RTStrVersionCompare(mStrDetectedOSVersion.c_str(), "20.04") > 0)
+            return S_OK;
+    }
 
     /* Earlier than OL 6.4 cannot be installed. OL 6.x fails with unsupported hardware error (CPU family). */