Changeset 101351 in vbox

Timestamp:

Oct 5, 2023 7:05:28 AM (19 months ago)

Author:

vboxsync

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

159352

Message:

Unattended: bugref:10530. Adapting kickstart file and kernel command line arguments to the new syntax introduced with OL9.

Location:

trunk/src/VBox

Files:

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

trunk/src/VBox/Installer/Config.kmk

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

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

@@ -44 +44 @@
         redhat67_ks.cfg \
         ol_ks.cfg \
+        ol9_ks.cfg \
         fedora_ks.cfg \
         suse_autoinstall.xml \

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

@@ +1 @@
+# Refer to RHEL9 kickstart reference:
+# https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/9/html/performing_an_advanced_rhel_9_installation/kickstart-commands-and-options-reference_installing-rhel-as-an-experienced-user
+
 #platform=x86, AMD64, or Intel EM64T
 #version=DEVEL
@@ -6 +9 @@
 
 # Install OS instead of upgrade
-install
+# Removed from kickstart file syntax in OL9
+#install
 
 # Use CDROM installation media
@@ -14 +18 @@
 rootpw --plaintext @@VBOX_INSERT_ROOT_PASSWORD_SH@@
 
+# auth or authconfig is deprecated in OL8
 # System authorization information
-auth  --useshadow  --passalgo=sha512
+#auth  --useshadow  --passalgo=sha512
 
 # Use text mode install
@@ -27 +32 @@
 
 # Disable the unsupported hardware popup (vmmdev?).
-unsupported_hardware
+# Removed from kickstart file syntax in OL9
+#unsupported_hardware
 
 # SELinux configuration
 selinux --enforcing
 
+# Deprecated in OL9
 # Installation logging level
-logging --level=info
+#logging --level=info
 
 # System timezone

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

@@ -653 +653 @@
 };
 
+/**
+ * RHEL installer.
+ *
+ * This serves as a base for the kickstart based installers.
+ */
+class UnattendedRhelInstaller : public UnattendedLinuxInstaller
+{
+public:
+    DECLARE_TRANSLATE_METHODS(UnattendedRhelInstaller)
+
+    UnattendedRhelInstaller(Unattended *pParent,
+                             const char *pszMainScriptTemplateName,
+                             const char *pszPostScriptTemplateName,
+                             const char *pszMainScriptFilename)
+        : UnattendedLinuxInstaller(pParent, pszMainScriptTemplateName, pszPostScriptTemplateName, pszMainScriptFilename)
+    {}
+    ~UnattendedRhelInstaller() {}
+
+    bool isAuxiliaryIsoIsVISO()             { return true; }
+    bool isOriginalIsoNeeded() const        { return false; }
+
+protected:
+    HRESULT addFilesToAuxVisoVectors(RTCList<RTCString> &rVecArgs, RTCList<RTCString> &rVecFiles,
+                                     RTVFS hVfsOrgIso, bool fOverwrite);
+};
 
 /**
  * RHEL 6 installer.
  *
- * This serves as a base for the kickstart based installers.
- */
-class UnattendedRhel6Installer : public UnattendedLinuxInstaller
+ */
+class UnattendedRhel6Installer : public UnattendedRhelInstaller
 {
 public:
@@ -668 +692 @@
                              const char *pszPostScriptTemplateName = "redhat_postinstall.sh",
                              const char *pszMainScriptFilename     = "ks.cfg")
-        : UnattendedLinuxInstaller(pParent, pszMainScriptTemplateName, pszPostScriptTemplateName, pszMainScriptFilename)
+        : UnattendedRhelInstaller(pParent, pszMainScriptTemplateName, pszPostScriptTemplateName, pszMainScriptFilename)
     {
         Assert(!isOriginalIsoNeeded()); Assert(isAuxiliaryIsoNeeded());
@@ -676 +700 @@
     }
     ~UnattendedRhel6Installer() {}
-
-    bool isAuxiliaryIsoIsVISO()             { return true; }
-    bool isOriginalIsoNeeded() const        { return false; }
-
-protected:
-    HRESULT addFilesToAuxVisoVectors(RTCList<RTCString> &rVecArgs, RTCList<RTCString> &rVecFiles,
-                                     RTVFS hVfsOrgIso, bool fOverwrite);
 };
 
@@ -849 +866 @@
 };
 
+/**
+ * Oracle Linux 9 installer.
+ * Uses a different kickstart file since several commands/options are removed in OL9.
+ * See the ol9_ks.cfg file for comments. Also, as of OL9 kernel command argument 'ks' should have
+ * 'inst.' prefix.
+ */
+class UnattendedOracleLinux9Installer : public UnattendedRhelInstaller
+{
+public:
+    DECLARE_TRANSLATE_METHODS(UnattendedOracleLinux9Installer)
+
+    UnattendedOracleLinux9Installer(Unattended *pParent,
+                                    const char *pszMainScriptTemplateName = "ol9_ks.cfg",
+                                    const char *pszPostScriptTemplateName = "ol_postinstall.sh",
+                                    const char *pszMainScriptFilename = "ks.cfg")
+        : UnattendedRhelInstaller(pParent, pszMainScriptTemplateName, pszPostScriptTemplateName, pszMainScriptFilename)
+    {
+        Assert(!isOriginalIsoNeeded());
+        Assert(isAuxiliaryIsoNeeded());
+        Assert(!isAuxiliaryFloppyNeeded());
+        Assert(isAuxiliaryIsoIsVISO());
+        mStrDefaultExtraInstallKernelParameters.assign(" inst.ks=cdrom:/").append(pszMainScriptFilename).append(' ');
+        mArrStrRemoveInstallKernelParameters.append("rd.live.check"); /* Disables the checkisomd5 step. Required for VISO. */
+    }
+    ~UnattendedOracleLinux9Installer() {}
+};
+
+
 #if 0 /* fixme */
 /**

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

@@ -103 +103 @@
         else if (enmDetectedOSType >= VBOXOSTYPE_Oracle && enmDetectedOSType <= VBOXOSTYPE_Oracle_latest_x64)
         {
-            if (RTStrVersionCompare(strDetectedOSVersion.c_str(), "8") >= 0)
+            if (RTStrVersionCompare(strDetectedOSVersion.c_str(), "9") >= 0)
+                pUinstaller = new UnattendedOracleLinux9Installer(pParent);
+            else if (RTStrVersionCompare(strDetectedOSVersion.c_str(), "8") >= 0)
                 pUinstaller = new UnattendedOracleLinux8Installer(pParent);
             else if (RTStrVersionCompare(strDetectedOSVersion.c_str(), "7") >= 0)
@@ -1364 +1366 @@
 */
 //////////////////////////////////////////////////////////////////////////////////////////////////////
-HRESULT UnattendedRhel6Installer::addFilesToAuxVisoVectors(RTCList<RTCString> &rVecArgs, RTCList<RTCString> &rVecFiles,
-                                                               RTVFS hVfsOrgIso, bool fOverwrite)
+HRESULT UnattendedRhelInstaller::addFilesToAuxVisoVectors(RTCList<RTCString> &rVecArgs, RTCList<RTCString> &rVecFiles,
+                                                          RTVFS hVfsOrgIso, bool fOverwrite)
 {
     Utf8Str strIsoLinuxCfg;