Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Vendors support in workaround for ARM upgrades from EL8 to EL9.5 #132

Merged
merged 2 commits into from
Dec 3, 2024
Merged

Vendors support in workaround for ARM upgrades from EL8 to EL9.5 #132

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
733a162
Reload EFI info, boot order has changed as Leapp upgrade efi entry wa…
yuravk Dec 2, 2024
0d12a80
Use specific to particular OS, EFI directory location path, like /boo…
yuravk Dec 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 18 additions & 1 deletion ...stem_upgrade/el8toel9/actors/addarmbootloaderworkaround/libraries/addupgradebootloader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,31 @@
from leapp.libraries.stdlib import api, CalledProcessError, run
from leapp.models import ArmWorkaroundEFIBootloaderInfo, EFIBootEntry, TargetUserSpaceInfo

dirname = {
'AlmaLinux': 'almalinux',
'CentOS Linux': 'centos',
'CentOS Stream': 'centos',
'Oracle Linux Server': 'redhat',
'Red Hat Enterprise Linux': 'redhat',
'Rocky Linux': 'rocky',
'Scientific Linux': 'redhat',
'EuroLinux': 'eurolinux',
}

with open('/etc/system-release', 'r') as sr:
release_line = next(line for line in sr if 'release' in line)
distro = release_line.split(' release ', 1)[0]

distro_dir = dirname.get(distro, 'default')

UPGRADE_EFI_ENTRY_LABEL = 'Leapp Upgrade'

ARM_SHIM_PACKAGE_NAME = 'shim-aa64'
ARM_GRUB_PACKAGE_NAME = 'grub2-efi-aa64'

EFI_MOUNTPOINT = '/boot/efi/'
LEAPP_EFIDIR_CANONICAL_PATH = os.path.join(EFI_MOUNTPOINT, 'EFI/leapp/')
RHEL_EFIDIR_CANONICAL_PATH = os.path.join(EFI_MOUNTPOINT, 'EFI/redhat/')
RHEL_EFIDIR_CANONICAL_PATH = os.path.join(EFI_MOUNTPOINT, 'EFI/', distro_dir)

CONTAINER_DOWNLOAD_DIR = '/tmp_pkg_download_dir'

Expand Down
21 changes: 20 additions & 1 deletion ...s/system_upgrade/el8toel9/actors/removeupgradeefientry/libraries/removeupgradeefientry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,26 @@
from leapp.libraries.stdlib import api, CalledProcessError, run
from leapp.models import ArmWorkaroundEFIBootloaderInfo

dirname = {
'AlmaLinux': 'almalinux',
'CentOS Linux': 'centos',
'CentOS Stream': 'centos',
'Oracle Linux Server': 'redhat',
'Red Hat Enterprise Linux': 'redhat',
'Rocky Linux': 'rocky',
'Scientific Linux': 'redhat',
'EuroLinux': 'eurolinux',
}

with open('/etc/system-release', 'r') as sr:
release_line = next(line for line in sr if 'release' in line)
distro = release_line.split(' release ', 1)[0]

distro_dir = dirname.get(distro, 'default')

EFI_MOUNTPOINT = '/boot/efi/'
LEAPP_EFIDIR_CANONICAL_PATH = os.path.join(EFI_MOUNTPOINT, 'EFI/leapp/')
RHEL_EFIDIR_CANONICAL_PATH = os.path.join(EFI_MOUNTPOINT, 'EFI/redhat/')
RHEL_EFIDIR_CANONICAL_PATH = os.path.join(EFI_MOUNTPOINT, 'EFI/', distro_dir)


def get_workaround_efi_info():
Expand Down Expand Up @@ -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])

Expand Down
Loading