Update ELevate vendors patch:
- make sure 'efi_finalization_fix' step runs before 'kernelcmdlineconfig' - fix no attribute 'Hints' error for 'leapp.reporting' module Bump the package release: 0.21.0-2.elevate.2
This commit is contained in:
parent
b7fed91696
commit
c1dc06ef51
@ -3714,7 +3714,7 @@ index 56016513..7ae1dd5a 100644
|
|||||||
tags = (IPUWorkflowTag, FactsPhaseTag)
|
tags = (IPUWorkflowTag, FactsPhaseTag)
|
||||||
|
|
||||||
diff --git a/repos/system_upgrade/common/actors/efibootorderfix/finalization/actor.py b/repos/system_upgrade/common/actors/efibootorderfix/finalization/actor.py
|
diff --git a/repos/system_upgrade/common/actors/efibootorderfix/finalization/actor.py b/repos/system_upgrade/common/actors/efibootorderfix/finalization/actor.py
|
||||||
index f42909f0..4a2bc8ad 100644
|
index f42909f0..4ddde9f7 100644
|
||||||
--- a/repos/system_upgrade/common/actors/efibootorderfix/finalization/actor.py
|
--- a/repos/system_upgrade/common/actors/efibootorderfix/finalization/actor.py
|
||||||
+++ b/repos/system_upgrade/common/actors/efibootorderfix/finalization/actor.py
|
+++ b/repos/system_upgrade/common/actors/efibootorderfix/finalization/actor.py
|
||||||
@@ -1,17 +1,118 @@
|
@@ -1,17 +1,118 @@
|
||||||
@ -3741,7 +3741,8 @@ index f42909f0..4a2bc8ad 100644
|
|||||||
- consumes = ()
|
- consumes = ()
|
||||||
+ consumes = (KernelCmdlineArg, InstalledTargetKernelVersion, FirmwareFacts, MountEntry)
|
+ consumes = (KernelCmdlineArg, InstalledTargetKernelVersion, FirmwareFacts, MountEntry)
|
||||||
produces = ()
|
produces = ()
|
||||||
tags = (FinalizationPhaseTag, IPUWorkflowTag)
|
- tags = (FinalizationPhaseTag, IPUWorkflowTag)
|
||||||
|
+ tags = (FinalizationPhaseTag.Before, IPUWorkflowTag)
|
||||||
|
|
||||||
def process(self):
|
def process(self):
|
||||||
- efi_reboot_fix.maybe_emit_updated_boot_entry()
|
- efi_reboot_fix.maybe_emit_updated_boot_entry()
|
||||||
@ -3902,6 +3903,36 @@ index 9e213f64..52cfe14f 100644
|
|||||||
variant=data.get('VARIANT', '').strip('"') or None,
|
variant=data.get('VARIANT', '').strip('"') or None,
|
||||||
variant_id=data.get('VARIANT_ID', '').strip('"') or None
|
variant_id=data.get('VARIANT_ID', '').strip('"') or None
|
||||||
)
|
)
|
||||||
|
diff --git a/repos/system_upgrade/common/actors/kernelcmdlineconfig/libraries/kernelcmdlineconfig.py b/repos/system_upgrade/common/actors/kernelcmdlineconfig/libraries/kernelcmdlineconfig.py
|
||||||
|
index 238a8aa6..6b261c3b 100644
|
||||||
|
--- 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,
|
||||||
diff --git a/repos/system_upgrade/common/actors/missinggpgkeysinhibitor/libraries/missinggpgkey.py b/repos/system_upgrade/common/actors/missinggpgkeysinhibitor/libraries/missinggpgkey.py
|
diff --git a/repos/system_upgrade/common/actors/missinggpgkeysinhibitor/libraries/missinggpgkey.py b/repos/system_upgrade/common/actors/missinggpgkeysinhibitor/libraries/missinggpgkey.py
|
||||||
index 32e4527b..1e595e9a 100644
|
index 32e4527b..1e595e9a 100644
|
||||||
--- a/repos/system_upgrade/common/actors/missinggpgkeysinhibitor/libraries/missinggpgkey.py
|
--- a/repos/system_upgrade/common/actors/missinggpgkeysinhibitor/libraries/missinggpgkey.py
|
||||||
|
@ -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: 2%{?dist}.elevate.1
|
Release: 2%{?dist}.elevate.2
|
||||||
Summary: Repositories for leapp
|
Summary: Repositories for leapp
|
||||||
|
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
@ -305,6 +305,11 @@ done;
|
|||||||
# no files here
|
# no files here
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Aug 29 2024 Yuriy Kohut <ykohut@almalinux.org> - 0.21.0-2.elevate.2
|
||||||
|
- Update ELevate patch:
|
||||||
|
- make sure 'efi_finalization_fix' step runs before 'kernelcmdlineconfig'
|
||||||
|
- fix no attribute 'Hints' error for 'leapp.reporting' module
|
||||||
|
|
||||||
* Thu Aug 22 2024 Yuriy Kohut <ykohut@almalinux.org> - 0.21.0-2.elevate.1
|
* Thu Aug 22 2024 Yuriy Kohut <ykohut@almalinux.org> - 0.21.0-2.elevate.1
|
||||||
- ELevate vendors support
|
- ELevate vendors support
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user