Changeset 101697 in vbox

Timestamp:

Nov 1, 2023 11:56:34 AM (19 months ago)

Author:

vboxsync

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

159791

Message:

Main/Unattended: Support OracleLinux for unattended installation, bugref:10516

Location:

trunk/src/VBox/Main

Files:

• UnattendedTemplates/ol9_ks.cfg (modified) (1 diff)
• UnattendedTemplates/ol_postinstall.sh (modified) (1 diff)
• src-server/UnattendedInstaller.cpp (modified) (4 diffs)

trunk/src/VBox/Main/UnattendedTemplates/ol9_ks.cfg

@@ -56 +56 @@
 
 # Disk partitioning information
+@@VBOX_COND_IS_FIRMWARE_UEFI@@
+part /boot/efi --fstype=efi --grow --maxsize=200 --size=20
+part /boot --fstype=ext4 --size=512
+@@VBOX_COND_END@@
+
 part / --fstype ext4 --size 6000 --grow --asprimary
 part swap --size 1024

trunk/src/VBox/Main/UnattendedTemplates/ol_postinstall.sh

@@ -238 +238 @@
 echo '** Installing VirtualBox Guest Additions...' | tee -a "${MY_LOGFILE}"
 MY_IGNORE_EXITCODE=2  # returned if modules already loaded and reboot required.
-log_command_in_target /bin/bash "${MY_CHROOT_CDROM}/vboxadditions/VBoxLinuxAdditions.run" --nox11
+log_command_in_target /bin/bash "${MY_CHROOT_CDROM}/vboxadditions/@@VBOX_INSERT_ADDITIONS_INSTALL_PACKAGE_NAME@@" --nox11
 log_command_in_target /bin/bash -c "udevadm control --reload-rules" # GAs doesn't yet do this.
 log_command_in_target /bin/bash -c "udevadm trigger"                 # (ditto)

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

@@ -1389 +1389 @@
                                                           RTVFS hVfsOrgIso, bool fOverwrite)
 {
-    Utf8Str strIsoLinuxCfg;
+    /*
+     * Figure out the name of the menu config file that we have to edit.
+     */
+    bool        fMenuConfigIsGrub     = false;
+    const char *pszMenuConfigFilename = "/isolinux/isolinux.cfg";
+    if (!hlpVfsFileExists(hVfsOrgIso, pszMenuConfigFilename))
+    {
+        /* arm64 variants of Oracle Linux 9 have grub. */
+        if (hlpVfsFileExists(hVfsOrgIso, "/EFI/BOOT/grub.cfg"))
+        {
+            pszMenuConfigFilename     =  "/EFI/BOOT/grub.cfg";
+            fMenuConfigIsGrub         = true;
+        }
+        else
+            AssertFailed();
+    }
+
+    /*
+     * VISO bits and filenames.
+     */
+    RTCString strBootCfg;
     try
     {
@@ -1403 +1423 @@
         rVecArgs.append() = "--dir-mode=0555";
 
-        /* We replace isolinux.cfg with our edited version (see further down). */
-        rVecArgs.append() = "isolinux/isolinux.cfg=:must-remove:";
-        strIsoLinuxCfg = mpParent->i_getAuxiliaryBasePath();
-        strIsoLinuxCfg.append("isolinux-isolinux.cfg");
-        rVecArgs.append().append("isolinux/isolinux.cfg=").append(strIsoLinuxCfg);
-
+        /* Replace the grub.cfg/isolinux.cfg configuration file. */
+        if (fMenuConfigIsGrub)
+        {
+            /* Replace menu configuration file as well. */
+            rVecArgs.append().assign(pszMenuConfigFilename).append("=:must-remove:");
+            strBootCfg = mpParent->i_getAuxiliaryBasePath();
+            strBootCfg.append("grub.cfg");
+            rVecArgs.append().assign(pszMenuConfigFilename).append("=").append(strBootCfg);
+        }
+        else
+        {
+            /* First remove. */
+            rVecArgs.append() = "isolinux/isolinux.cfg=:must-remove:";
+            strBootCfg = mpParent->i_getAuxiliaryBasePath();
+            strBootCfg.append("isolinux-isolinux.cfg");
+            rVecArgs.append().append("isolinux/isolinux.cfg=").append(strBootCfg);
+        }
 #else
         /** @todo Maybe we should just remaster the ISO for redhat derivatives too?
@@ -1423 +1454 @@
         rVecArgs.append() = "/isolinux/isolinux.cfg=:must-remove:";
 
-        strIsoLinuxCfg = mpParent->i_getAuxiliaryBasePath();
-        strIsoLinuxCfg.append("isolinux-isolinux.cfg");
-        rVecArgs.append().append("/isolinux/isolinux.cfg=").append(strIsoLinuxCfg);
+        strBootCfg = mpParent->i_getAuxiliaryBasePath();
+        strBootCfg.append("isolinux-isolinux.cfg");
+        rVecArgs.append().append("/isolinux/isolinux.cfg=").append(strBootCfg);
 
         /* Configure booting /isolinux/isolinux.bin. */
@@ -1444 +1475 @@
     }
 
-    /*
-     * Edit isolinux.cfg and save it.
-     */
     {
         GeneralTextScript Editor(mpParent);
-        HRESULT hrc = loadAndParseFileFromIso(hVfsOrgIso, "/isolinux/isolinux.cfg", &Editor);
+        HRESULT hrc = loadAndParseFileFromIso(hVfsOrgIso, pszMenuConfigFilename, &Editor);
         if (SUCCEEDED(hrc))
-            hrc = editIsoLinuxCfg(&Editor);
-        if (SUCCEEDED(hrc))
-        {
-            hrc = Editor.save(strIsoLinuxCfg, fOverwrite);
+        {
+            if (fMenuConfigIsGrub)
+                hrc = editGrubCfg(&Editor);
+            else
+                hrc = editIsoLinuxCfg(&Editor);
             if (SUCCEEDED(hrc))
             {
-                try
+                hrc = Editor.save(strBootCfg, fOverwrite);
+                if (SUCCEEDED(hrc))
                 {
-                    rVecFiles.append(strIsoLinuxCfg);
-                }
-                catch (std::bad_alloc &)
-                {
-                    RTFileDelete(strIsoLinuxCfg.c_str());
-                    hrc = E_OUTOFMEMORY;
+                    try
+                    {
+                        rVecFiles.append(strBootCfg);
+                    }
+                    catch (std::bad_alloc &)
+                    {
+                        RTFileDelete(strBootCfg.c_str());
+                        hrc = E_OUTOFMEMORY;
+                    }
                 }
             }