CLOS-2842: Cover centos/cloudlinux EFI paths in hybrid BIOS+UEFI handling

On hybrid BIOS+UEFI systems, AddUpgradeBootEntry must update both
/boot/grub2/grub.cfg AND the EFI-side grub.cfg, otherwise the upgrade
boot entry may not become the actual boot default. The actor only
checked /boot/efi/EFI/redhat/grub.cfg, which is the RHEL subdirectory.

CloudLinux 7 hybrid setups use /boot/efi/EFI/centos/grub.cfg (inherited
from CentOS); CloudLinux 8+ uses /boot/efi/EFI/cloudlinux/grub.cfg.
Neither was covered, so the EFI-side config went stale and reboot
landed on the old kernel - the failure mode in CLOS-2842 / ZD 226456
("stage 3 -> stage 3 loop"). The customer's manual fix in that ticket
explicitly regenerated /boot/efi/EFI/centos/grub.cfg, which is what we
now make the actor do automatically.

Extract the path detection into a tested helper and broaden the check
to redhat, centos, cloudlinux, almalinux (first match wins). Add
parametrized unit tests covering all six branches.

Related: https://bugzilla.redhat.com/show_bug.cgi?id=1667028

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: prilr

repos/system_upgrade/common/actors/addupgradebootentry/actor.py

@@ -1,8 +1,10 @@
-import os
-
 from leapp.actors import Actor
 from leapp.exceptions import StopActorExecutionError
-from leapp.libraries.actor.addupgradebootentry import add_boot_entry, fix_grub_config_error
+from leapp.libraries.actor.addupgradebootentry import (
+    add_boot_entry,
+    fix_grub_config_error,
+    get_hybrid_bios_efi_configs,
+)
 from leapp.models import BootContent, FirmwareFacts, GrubConfigError, TargetKernelCmdlineArgTasks, TransactionDryRun
 from leapp.tags import InterimPreparationPhaseTag, IPUWorkflowTag
 
@@ -24,16 +26,11 @@ def process(self):
             if grub_config_error.error_detected:
                 fix_grub_config_error('/etc/default/grub', grub_config_error.error_type)
 
-        configs = None
         ff = next(self.consume(FirmwareFacts), None)
         if not ff:
             raise StopActorExecutionError(
                 'Could not identify system firmware',
                 details={'details': 'Actor did not receive FirmwareFacts message.'}
             )
 
-        # related to issue with hybrid BIOS and UEFI images
-        # https://bugzilla.redhat.com/show_bug.cgi?id=1667028
-        if ff.firmware == 'bios' and os.path.ismount('/boot/efi') and os.path.isfile('/boot/efi/EFI/redhat/grub.cfg'):
-            configs = ['/boot/grub2/grub.cfg', '/boot/efi/EFI/redhat/grub.cfg']
-        add_boot_entry(configs)
+        add_boot_entry(get_hybrid_bios_efi_configs(ff.firmware))

repos/system_upgrade/common/actors/addupgradebootentry/libraries/addupgradebootentry.py

@@ -7,6 +7,28 @@
 from leapp.models import BootContent, KernelCmdlineArg, TargetKernelCmdlineArgTasks
 
 
+def get_hybrid_bios_efi_configs(firmware):
+    """
+    On a BIOS-firmware system with /boot/efi mounted, the EFI directory may also hold
+    a grub.cfg that GRUB consults at boot. grubby --copy-default --make-default only
+    updates /boot/grub2/grub.cfg by default; if the EFI-side grub.cfg is not also
+    updated, the new entry may not become the actual boot default.
+
+    The OS-name subdirectory under /boot/efi/EFI/ varies by distribution. Check the
+    known options and return the configs list for add_boot_entry, or None if no
+    EFI-side grub.cfg is present.
+
+    Related: https://bugzilla.redhat.com/show_bug.cgi?id=1667028
+    """
+    if firmware != 'bios' or not os.path.ismount('/boot/efi'):
+        return None
+    for efi_subdir in ('redhat', 'centos', 'cloudlinux', 'almalinux'):
+        efi_cfg = '/boot/efi/EFI/{0}/grub.cfg'.format(efi_subdir)
+        if os.path.isfile(efi_cfg):
+            return ['/boot/grub2/grub.cfg', efi_cfg]
+    return None
+
+
 def add_boot_entry(configs=None):
     debug = 'debug' if os.getenv('LEAPP_DEBUG', '0') == '1' else ''
     enable_network = os.getenv('LEAPP_DEVEL_INITRAM_NETWORK') in ('network-manager', 'scripts')

repos/system_upgrade/common/actors/addupgradebootentry/tests/unit_test_addupgradebootentry.py

@@ -185,6 +185,38 @@ def consume_no_message_mocked(*models):
         addupgradebootentry.get_boot_file_paths()
 
 
+@pytest.mark.parametrize(
+    'firmware, mount, existing_efi_cfgs, expected',
+    [
+        # EFI firmware: hybrid path does not apply, even if /boot/efi is mounted
+        ('efi', True, ['/boot/efi/EFI/redhat/grub.cfg'], None),
+        # BIOS firmware but /boot/efi not mounted
+        ('bios', False, ['/boot/efi/EFI/centos/grub.cfg'], None),
+        # BIOS + /boot/efi mounted, redhat path (RHEL-derived systems)
+        ('bios', True, ['/boot/efi/EFI/redhat/grub.cfg'],
+         ['/boot/grub2/grub.cfg', '/boot/efi/EFI/redhat/grub.cfg']),
+        # BIOS + /boot/efi mounted, centos path (CL7 hybrid setups - was missed before)
+        ('bios', True, ['/boot/efi/EFI/centos/grub.cfg'],
+         ['/boot/grub2/grub.cfg', '/boot/efi/EFI/centos/grub.cfg']),
+        # BIOS + /boot/efi mounted, cloudlinux path (CL8+ hybrid setups - was missed before)
+        ('bios', True, ['/boot/efi/EFI/cloudlinux/grub.cfg'],
+         ['/boot/grub2/grub.cfg', '/boot/efi/EFI/cloudlinux/grub.cfg']),
+        # BIOS + /boot/efi mounted, almalinux path
+        ('bios', True, ['/boot/efi/EFI/almalinux/grub.cfg'],
+         ['/boot/grub2/grub.cfg', '/boot/efi/EFI/almalinux/grub.cfg']),
+        # BIOS + /boot/efi mounted, no known grub.cfg present
+        ('bios', True, [], None),
+        # BIOS + /boot/efi mounted, multiple paths present - redhat wins (checked first)
+        ('bios', True, ['/boot/efi/EFI/redhat/grub.cfg', '/boot/efi/EFI/centos/grub.cfg'],
+         ['/boot/grub2/grub.cfg', '/boot/efi/EFI/redhat/grub.cfg']),
+    ]
+)
+def test_get_hybrid_bios_efi_configs(monkeypatch, firmware, mount, existing_efi_cfgs, expected):
+    monkeypatch.setattr(os.path, 'ismount', lambda p: p == '/boot/efi' and mount)
+    monkeypatch.setattr(os.path, 'isfile', lambda p: p in existing_efi_cfgs)
+    assert addupgradebootentry.get_hybrid_bios_efi_configs(firmware) == expected
+
+
 @pytest.mark.skip("Broken test")
 @pytest.mark.parametrize(
     ('error_type', 'test_file_name'),