Warn about incompatible kernel

And update grub settings so that convert2rhel can call grub2-mkconfig.

Author: bocekm

convert2rhel/actions/post_conversion/update_grub.py

@@ -18,13 +18,44 @@
 from convert2rhel import actions, backup, grub, utils
 from convert2rhel.backup.files import RestorableFile
 from convert2rhel.logger import root_logger
-
+from convert2rhel.systeminfo import system_info
 
 logger = root_logger.getChild(__name__)
 
 
+class FixGrubSettingsOnAL2(actions.Action):
+    id = "FIX_GRUB_SETTINGS_ON_AL2"
+
+    def run(self):
+        """On Amazon Linux 2 the GRUB_TERMINAL setting in /etc/default/grub is set to "ec2-console". Leaving it there
+        prevents us from successfully executing grub2-mkconfig - we need to change that to "console".
+        """
+        super(FixGrubSettingsOnAL2, self).run()
+
+        logger.task("Fix GRUB2 settings on Amazon Linux 2")
+        if system_info.version.major != 2:
+            logger.info("Not running Amazon Linux 2, skipping.")
+            return
+
+        file_path = "/etc/default/grub"
+        old_value = 'GRUB_TERMINAL="ec2-console"'
+        new_value = 'GRUB_TERMINAL="console"'
+
+        content = utils.get_file_content(file_path)
+        if old_value in content:
+            updated_content = content.replace(old_value, new_value)
+
+            with open("/etc/default/grub", "w") as file:
+                file.write(updated_content)
+            logger.debug("Replaced {} with {} in {}.".format(old_value, new_value, file_path))
+            logger.info("Successfully updated /etc/default/grub.")
+        else:
+            logger.info("{} not found in {}. Nothing to do.".format(old_value, file_path))
+
+
 class UpdateGrub(actions.Action):
     id = "UPDATE_GRUB"
+    dependencies = ("FIX_GRUB_SETTINGS_ON_AL2",)
 
     def run(self):
         """Update GRUB2 images and config after conversion.

convert2rhel/actions/pre_ponr_changes/yum_variables.py

@@ -85,6 +85,7 @@ def _back_up_var_files(self, paths):
         for filepath in paths:
             restorable_file = RestorableFile(filepath)
             backup.backup_control.push(restorable_file)
+        logger.info("Yum variables successfully backed up.")
 
 
 class RestoreYumVarFiles(actions.Action):

convert2rhel/actions/system_checks/rhel_compatible_kernel.py

@@ -27,7 +27,7 @@
 
 # The kernel version stays the same throughout a RHEL major version
 COMPATIBLE_KERNELS_VERS = {
-    2: "4.14.355",  # Amazon Linux 2
+    2: "4.18.0",  # In Amazon Linux 2 there's no kernel of the same version as in RHEL (there's 4.14 and 5.10)
     7: "3.10.0",
     8: "4.18.0",
     9: "5.14.0",
@@ -68,7 +68,19 @@ def run(self):
                 logger.warning(bad_kernel_message)
 
                 if system_info.version.major == 2:
-                    # Temp exception for Amazon Linux 2
+                    logger.warning(
+                        "Ignoring the check result on Amazon Linux 2 as there's no kernel of the same"
+                        " version as in RHEL available."
+                    )
+                    self.add_message(
+                        level="WARNING",
+                        id="INCOMPATIBLE_KERNEL_ON_AL2",
+                        title="Incompatible booted kernel version",
+                        description="On Amazon Linux 2 there's no kernel of the same version as in RHEL available."
+                        " The kernel downgrade during the conversion may cause issues, proceed at your"
+                        " own risk.",
+                        diagnosis=bad_kernel_message,
+                    )
                     return
                 self.set_result(
                     level="ERROR",
@@ -111,11 +123,10 @@ def _bad_kernel_version(kernel_release):
         raise KernelIncompatibleError(
             "INCOMPATIBLE_VERSION",
             "Booted kernel version '{kernel_version}' does not correspond to the version "
-            "'{compatible_version}' available in RHEL {rhel_major_version}",
+            "'{compatible_version}' available in RHEL",
             {
                 "kernel_version": kernel_version,
                 "compatible_version": COMPATIBLE_KERNELS_VERS[system_info.version.major],
-                "rhel_major_version": system_info.version.major,
             },
         )
 

convert2rhel/data/7/x86_64/configs/amazon-2-x86_64.cfg

@@ -17,6 +17,7 @@ excluded_pkgs =
   gnome-documents-libs
   git-core*
   grub2-tools-efi
+  grub2-efi-x64-ec2
   python3*
   libsanitizer
   update-motd
@@ -30,6 +31,7 @@ excluded_pkgs =
   libfdisk
   awscli
   aws-cfn-bootstrap
+  amazon-linux-extras-yum-plugin
 
 # Mapping of packages that need to be swapped during the transaction
 swap_pkgs =

convert2rhel/unit_tests/actions/system_checks/rhel_compatible_kernel_test.py

@@ -161,7 +161,7 @@ def test_bad_kernel_version_success(kernel_release, major_ver, exp_return, monke
             8,
             "INCOMPATIBLE_VERSION",
             "Booted kernel version '{kernel_version}' does not correspond to the version "
-            "'{compatible_version}' available in RHEL {rhel_major_version}",
+            "'{compatible_version}' available in RHEL",
             {"kernel_version": "5.4.17", "compatible_version": COMPATIBLE_KERNELS_VERS[8], "rhel_major_version": 8},
         ),
     ),