Changeset 101356 in vbox

Timestamp:

Oct 5, 2023 12:44:33 PM (18 months ago)

Author:

vboxsync

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

159358

Message:

Unattended: ​bugref:10530. Looks like OL8 kickstart used to include a removed command.

Location:

trunk/src/VBox

Files:

• Installer/Config.kmk (modified) (1 diff)
• Main/UnattendedTemplates/Makefile.kmk (modified) (1 diff)
• Main/UnattendedTemplates/ol8_ks.cfg (copied) (copied from trunk/src/VBox/Main/UnattendedTemplates/ol_ks.cfg ) (1 diff)
• Main/include/UnattendedInstaller.h (modified) (2 diffs)

trunk/src/VBox/Installer/Config.kmk

@@ -73 +73 @@
         fedora_ks.cfg \
         ol_ks.cfg \
+        ol8_ks.cfg \
         ol9_ks.cfg \
         rhel3_ks.cfg \

trunk/src/VBox/Main/UnattendedTemplates/Makefile.kmk

@@ -44 +44 @@
         redhat67_ks.cfg \
         ol_ks.cfg \
+        ol8_ks.cfg \
         ol9_ks.cfg \
         fedora_ks.cfg \

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

@@ -27 +27 @@
 
 # Disable the unsupported hardware popup (vmmdev?).
-unsupported_hardware
+# This has been removed from kickstart file format as of OL8
+#unsupported_hardware
 
 # SELinux configuration

trunk/src/VBox/Main/include/UnattendedInstaller.h

@@ -845 +845 @@
 
 /**
- * Oracle Linux 8 installer. Same as OL 7.
- * The class was added for better handling any possible subtle difference between OL7 and OL8.
+ * Oracle Linux 8 installer. Using a different kickstart file than earlier OL versions.
  */
 class UnattendedOracleLinux8Installer : public UnattendedOracleLinux7Installer
@@ -853 +852 @@
     DECLARE_TRANSLATE_METHODS(UnattendedOracleLinux8Installer)
 
-    UnattendedOracleLinux8Installer(Unattended *pParent)
-        : UnattendedOracleLinux7Installer(pParent)
-    { Assert(!isOriginalIsoNeeded()); Assert(isAuxiliaryIsoNeeded()); Assert(!isAuxiliaryFloppyNeeded()); Assert(isAuxiliaryIsoIsVISO()); }
-
     UnattendedOracleLinux8Installer(Unattended *pParent,
-                                    const char *pszMainScriptTemplateName,
-                                    const char *pszPostScriptTemplateName,
-                                    const char *pszMainScriptFilename)
+                                    const char *pszMainScriptTemplateName = "ol8_ks.cfg",
+                                    const char *pszPostScriptTemplateName = "ol_postinstall.sh",
+                                    const char *pszMainScriptFilename = "ks.cfg")
+
         : UnattendedOracleLinux7Installer(pParent, pszMainScriptTemplateName, pszPostScriptTemplateName, pszMainScriptFilename)
     { Assert(!isOriginalIsoNeeded()); Assert(isAuxiliaryIsoNeeded()); Assert(!isAuxiliaryFloppyNeeded()); Assert(isAuxiliaryIsoIsVISO()); }