Changeset 101633 in vbox for trunk

Timestamp:

Oct 27, 2023 3:11:34 PM (15 months ago)

Author:

vboxsync

Message:

Main/Unattended: Support debian arm64 (tested with Debian 11 netinst) images, bugref:10516

Location:

trunk

Files:

• include/VBox/ostypes.h (modified) (2 diffs)
• src/VBox/Main/src-server/UnattendedImpl.cpp (modified) (3 diffs)
• src/VBox/Main/src-server/UnattendedInstaller.cpp (modified) (2 diffs)

trunk/include/VBox/ostypes.h

@@ -141 +141 @@
     VBOXOSTYPE_Debian12_arm64   = 0x5530a,
     VBOXOSTYPE_Debian_latest_x64 = VBOXOSTYPE_Debian12_x64,
+    VBOXOSTYPE_Debian_latest_arm64 = VBOXOSTYPE_Debian12_arm64,
     VBOXOSTYPE_OpenSUSE         = 0x56000,
     VBOXOSTYPE_OpenSUSE_x64     = 0x56100,
@@ -228 +229 @@
     VBOXOSTYPE_Ubuntu23_arm64   = 0x5C317,
     VBOXOSTYPE_Ubuntu_latest_x64 = VBOXOSTYPE_Ubuntu23_x64,
+    VBOXOSTYPE_Ubuntu_latest_arm64 = VBOXOSTYPE_Ubuntu23_arm64,
     VBOXOSTYPE_Xandros          = 0x5D000,
     VBOXOSTYPE_Xandros_x64      = 0x5D100,

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

@@ -2055 +2055 @@
                         else if (pNtHdrs->FileHeader.Machine == IMAGE_FILE_MACHINE_AMD64)
                             mEnmOsType = (VBOXOSTYPE)((mEnmOsType & ~VBOXOSTYPE_ArchitectureMask) | VBOXOSTYPE_x64);
+                        else if (pNtHdrs->FileHeader.Machine == IMAGE_FILE_MACHINE_ARM64)
+                            mEnmOsType = (VBOXOSTYPE)((mEnmOsType & ~VBOXOSTYPE_ArchitectureMask) | VBOXOSTYPE_arm64);
                         else
                             AssertFailed();
@@ -2632 +2634 @@
 
     /* We don't support guest OSes w/ EFI, as that requires UDF remastering support we don't have yet. */
-    if (osHint & VBOXOSHINT_EFI)
+    if (   (osHint & VBOXOSHINT_EFI)
+        && (enmIsoOSType & VBOXOSTYPE_ArchitectureMask) != VBOXOSTYPE_arm64)
         return setError(E_FAIL, tr("The detected guest OS type requires EFI to boot and therefore is not supported yet"));
 
@@ -3949 +3952 @@
         return S_OK;
 
-    /* For now we don't support unattended installation for ARM guests. */
-    const VBOXOSTYPE enmArchitectureMasked = (VBOXOSTYPE)(mEnmOsType & VBOXOSTYPE_ArchitectureMask);
-    if (   enmArchitectureMasked == VBOXOSTYPE_arm32
-        || enmArchitectureMasked == VBOXOSTYPE_arm64)
-        return S_OK;
-
     const VBOXOSTYPE enmOsTypeMasked = (VBOXOSTYPE)(mEnmOsType & VBOXOSTYPE_OsTypeMask);
 

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

@@ -78 +78 @@
     else
     {
-        if (enmDetectedOSType >= VBOXOSTYPE_Debian && enmDetectedOSType <= VBOXOSTYPE_Debian_latest_x64)
+        if (   enmDetectedOSType >= VBOXOSTYPE_Debian
+            && (   enmDetectedOSType <= VBOXOSTYPE_Debian_latest_x64
+                || enmDetectedOSType <= VBOXOSTYPE_Debian_latest_arm64))
             pUinstaller = new UnattendedDebianInstaller(pParent);
         else if (enmDetectedOSType >= VBOXOSTYPE_Ubuntu && enmDetectedOSType <= VBOXOSTYPE_Ubuntu_latest_x64)
@@ -1287 +1289 @@
         /* Set timeouts to 4 seconds. */
         std::vector<size_t> vecLineNumbers = pEditor->findTemplate("set timeout", RTCString::CaseInsensitive);
-        for (size_t i = 0; i < vecLineNumbers.size(); ++i)
-            if (pEditor->getContentOfLine(vecLineNumbers[i]).startsWithWord("set timeout", RTCString::CaseInsensitive))
-            {
-                HRESULT hrc = pEditor->setContentOfLine(vecLineNumbers.at(i), "set timeout=4");
-                if (FAILED(hrc))
-                    return hrc;
-            }
+        if (vecLineNumbers.size() > 0)
+        {
+            for (size_t i = 0; i < vecLineNumbers.size(); ++i)
+                if (pEditor->getContentOfLine(vecLineNumbers[i]).startsWithWord("set timeout", RTCString::CaseInsensitive))
+                {
+                    HRESULT hrc = pEditor->setContentOfLine(vecLineNumbers.at(i), "set timeout=4");
+                    if (FAILED(hrc))
+                        return hrc;
+                }
+        }
+        else
+        {
+            /* Append timeout if not set (happens with arm64 iso images at least). */
+            HRESULT hrc = pEditor->appendLine("set timeout=4");
+            if (FAILED(hrc))
+                return hrc;
+        }
 
         /* Modify kernel lines assuming that they starts with 'linux' keyword and 2nd word is the kernel command.*