diff --git a/SOURCES/leapp-repository-0.21.0-elevate.patch b/SOURCES/leapp-repository-0.21.0-elevate.patch index 54ce343..fefaddc 100644 --- a/SOURCES/leapp-repository-0.21.0-elevate.patch +++ b/SOURCES/leapp-repository-0.21.0-elevate.patch @@ -5664,7 +5664,7 @@ index 5e9bf5c6..eb5636c9 100644 CONTAINER_DOWNLOAD_DIR = '/tmp_pkg_download_dir' diff --git a/repos/system_upgrade/el8toel9/actors/removeupgradeefientry/libraries/removeupgradeefientry.py b/repos/system_upgrade/el8toel9/actors/removeupgradeefientry/libraries/removeupgradeefientry.py -index 3ff3ead9..3d93f6fd 100644 +index 3ff3ead9..ee63916a 100644 --- a/repos/system_upgrade/el8toel9/actors/removeupgradeefientry/libraries/removeupgradeefientry.py +++ b/repos/system_upgrade/el8toel9/actors/removeupgradeefientry/libraries/removeupgradeefientry.py @@ -6,9 +6,26 @@ from leapp.libraries.common.grub import GRUB2_BIOS_ENTRYPOINT, GRUB2_BIOS_ENV_FI @@ -5695,12 +5695,3 @@ index 3ff3ead9..3d93f6fd 100644 def get_workaround_efi_info(): -@@ -54,6 +71,8 @@ def remove_upgrade_efi_entry(): - except CalledProcessError: - api.current_logger().warning('Unable to remove Leapp upgrade efi files.') - -+ # Reload EFI info, boot order has changed as Leapp upgrade efi entry was removed -+ bootloader_info = get_workaround_efi_info() - original_boot_number = bootloader_info.original_entry.boot_number - run(['/usr/sbin/efibootmgr', '--bootnext', original_boot_number]) - diff --git a/SPECS/leapp-repository.spec b/SPECS/leapp-repository.spec index 82979ba..83ecaf3 100644 --- a/SPECS/leapp-repository.spec +++ b/SPECS/leapp-repository.spec @@ -53,7 +53,7 @@ py2_byte_compile "%1" "%2"} Epoch: 1 Name: leapp-repository Version: 0.21.0 -Release: 4%{?dist}.elevate.2 +Release: 4%{?dist}.elevate.3 Summary: Repositories for leapp License: ASL 2.0 @@ -402,6 +402,10 @@ done; # no files here %changelog +* Fri Dec 06 2024 Yuriy Kohut - 0.21.0-4.elevate.3 +- Update ELevate patch: + - remove_upgrade_efi_entry: revert reload EFI info, boot order has changed as Leapp upgrade efi entry was removed + * Tue Dec 03 2024 Yuriy Kohut - 0.21.0-4.elevate.2 - Update ELevate patch: - add_arm_bootloader_workaround, remove_upgrade_efi_entry: use specific to particular OS, EFI directory location path, like /boot/efi/EFI/$distro_dir