Merge pull request #126 from yuravk/almalinux-ng-0.21.0

Fix some Finalization phase errors
AlmaLinux · Aug 29, 2024 · 174b1a0 · 174b1a0
2 parents e70b6ec + 46df911
commit 174b1a0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/repos/system_upgrade/common/actors/efibootorderfix/finalization/actor.py b/repos/system_upgrade/common/actors/efibootorderfix/finalization/actor.py
@@ -18,7 +18,7 @@ class EfiFinalizationFix(Actor):
     name = 'efi_finalization_fix'
     consumes = (KernelCmdlineArg, InstalledTargetKernelVersion, FirmwareFacts, MountEntry)
     produces = ()
-    tags = (FinalizationPhaseTag, IPUWorkflowTag)
+    tags = (FinalizationPhaseTag.Before, IPUWorkflowTag)
 
     def process(self):
         is_system_efi = False

diff --git a/repos/system_upgrade/common/actors/kernelcmdlineconfig/libraries/kernelcmdlineconfig.py b/repos/system_upgrade/common/actors/kernelcmdlineconfig/libraries/kernelcmdlineconfig.py
@@ -175,14 +175,14 @@ def entrypoint(configs=None):
         api.current_logger().error(str(e))
 
         if use_cmdline_file():
-            report_hint = reporting.Hints(
+            report_hint = (
                 'After the system has been rebooted into the new version of RHEL, you'
                 ' should take the kernel cmdline arguments from /proc/cmdline (Everything'
                 ' except the BOOT_IMAGE entry and initrd entries) and copy them into'
                 ' /etc/kernel/cmdline before installing any new kernels.'
             )
         else:
-            report_hint = reporting.Hints(
+            report_hint = (
                 'After the system has been rebooted into the new version of RHEL, you'
                 ' should take the kernel cmdline arguments from /proc/cmdline (Everything'
                 ' except the BOOT_IMAGE entry and initrd entries) and then use the'
@@ -204,7 +204,7 @@ def entrypoint(configs=None):
                 ' not able to set the arguments as the default for kernels installed in'
                 ' the future.'
             ),
-            report_hint,
+            reporting.Remediation(hint=report_hint),
             reporting.Severity(reporting.Severity.HIGH),
             reporting.Groups([
                 reporting.Groups.BOOT,