rpms/leapp-repository
7
0
Fork 1
Code Issues Pull Requests Releases Activity

Revert reload EFI info patch for remove_upgrade_efi_entry #14

Merged
alukoshko merged 1 commits from ykohut/leapp-repository:a8-elevate-0210 into a8-elevate-0210 2024-12-06 17:31:06 +00:00
Conversation 0 Commits 1 Files Changed 2 +6 -11
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c61707ca67 - Show all commits

11
SOURCES/leapp-repository-0.21.0-elevate.patch
View File

@ -5664,7 +5664,7 @@ index 5e9bf5c6..eb5636c9 100644
CONTAINER_DOWNLOAD_DIR = '/tmp_pkg_download_dir' 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 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 --- a/repos/system_upgrade/el8toel9/actors/removeupgradeefientry/libraries/removeupgradeefientry.py
+++ b/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 @@ -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(): 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])

6
SPECS/leapp-repository.spec
View File

@ -53,7 +53,7 @@ py2_byte_compile "%1" "%2"}
Epoch: 1 Epoch: 1
Name: leapp-repository Name: leapp-repository
Version: 0.21.0 Version: 0.21.0
Release: 4%{?dist}.elevate.2 Release: 4%{?dist}.elevate.3
Summary: Repositories for leapp Summary: Repositories for leapp
License: ASL 2.0 License: ASL 2.0
@ -402,6 +402,10 @@ done;
# no files here # no files here
%changelog %changelog
* Fri Dec 06 2024 Yuriy Kohut <ykohut@almalinux.org> - 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 <ykohut@almalinux.org> - 0.21.0-4.elevate.2 * Tue Dec 03 2024 Yuriy Kohut <ykohut@almalinux.org> - 0.21.0-4.elevate.2
- Update ELevate patch: - 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 - add_arm_bootloader_workaround, remove_upgrade_efi_entry: use specific to particular OS, EFI directory location path, like /boot/efi/EFI/$distro_dir