From 8385b9917669fcb07f9b57d3ca8f8859e46baefa Mon Sep 17 00:00:00 2001 From: Andrew Lukoshko Date: Fri, 12 May 2023 14:45:46 +0200 Subject: [PATCH] Update ELevate patch --- SOURCES/leapp-repository-0.16.0-elevate.patch | 13 +++++++++++++ SPECS/leapp-repository.spec | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/SOURCES/leapp-repository-0.16.0-elevate.patch b/SOURCES/leapp-repository-0.16.0-elevate.patch index 92e71ed..8eb68a5 100644 --- a/SOURCES/leapp-repository-0.16.0-elevate.patch +++ b/SOURCES/leapp-repository-0.16.0-elevate.patch @@ -3168,6 +3168,19 @@ index e0d89d9..8fc5954 100644 + to_reinstall=list(to_reinstall), modules_to_reset=list(modules_to_reset.values()), modules_to_enable=list(modules_to_enable.values()))) +diff --git a/repos/system_upgrade/common/actors/initramfs/upgradeinitramfsgenerator/files/generate-initram.sh b/repos/system_upgrade/common/actors/initramfs/upgradeinitramfsgenerator/files/generate-initram.sh +index 3e904f6..9b717a8 100755 +--- a/repos/system_upgrade/common/actors/initramfs/upgradeinitramfsgenerator/files/generate-initram.sh ++++ b/repos/system_upgrade/common/actors/initramfs/upgradeinitramfsgenerator/files/generate-initram.sh +@@ -7,7 +7,7 @@ stage() { + } + + get_kernel_version() { +- rpm -qa | grep kernel-modules | cut -d- -f3- | sort | tail -n 1 ++ rpm -qa kernel --qf '%{VERSION}-%{RELEASE}.%{ARCH}\n' | sort --version-sort | tail --lines=1 + } + + dracut_install_modules() diff --git a/repos/system_upgrade/common/actors/ipuworkflowconfig/libraries/ipuworkflowconfig.py b/repos/system_upgrade/common/actors/ipuworkflowconfig/libraries/ipuworkflowconfig.py index edf978f..7fea4ec 100644 --- a/repos/system_upgrade/common/actors/ipuworkflowconfig/libraries/ipuworkflowconfig.py diff --git a/SPECS/leapp-repository.spec b/SPECS/leapp-repository.spec index 4eaa4c3..263daf3 100644 --- a/SPECS/leapp-repository.spec +++ b/SPECS/leapp-repository.spec @@ -43,7 +43,7 @@ py2_byte_compile "%1" "%2"} Epoch: 1 Name: leapp-repository Version: 0.16.0 -Release: 6%{?dist}.elevate.11 +Release: 6%{?dist}.elevate.12 Summary: Repositories for leapp License: ASL 2.0