diff --git a/0001-RHSM-Adjust-the-switch-to-container-mode-for-new-RHS.patch b/0001-RHSM-Adjust-the-switch-to-container-mode-for-new-RHS.patch new file mode 100644 index 0000000..241a920 --- /dev/null +++ b/0001-RHSM-Adjust-the-switch-to-container-mode-for-new-RHS.patch @@ -0,0 +1,37 @@ +From b6e409e1055b5d8b7f27e5df9eae096eb592a9c7 Mon Sep 17 00:00:00 2001 +From: Petr Stodulka +Date: Fri, 27 Oct 2023 13:34:38 +0200 +Subject: [PATCH] RHSM: Adjust the switch to container mode for new RHSM + +RHSM in RHEL 8.9+ & RHEL 9.3+ requires newly for the switch to the +container mode existence and content under /etc/pki/entitlement-host, +which in our case should by symlink to /etc/pki/entitlement. + +So currently we need for the correct switch 2 symlinks: + * /etc/pki/rhsm-host -> /etc/pki/rhsm + * /etc/pki/entitlement-host -> /etc/pki/entitlement + +Technically we need that only for RHEL 8.9+ but discussing it with +RHSM SST, we can do this change unconditionally for any RHEL system +as older versions of RHSM do not check /etc/pki/entitlement-host. + +jira: RHEL-14839 +--- + repos/system_upgrade/common/libraries/rhsm.py | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/repos/system_upgrade/common/libraries/rhsm.py b/repos/system_upgrade/common/libraries/rhsm.py +index 4a5b0eb0..18842021 100644 +--- a/repos/system_upgrade/common/libraries/rhsm.py ++++ b/repos/system_upgrade/common/libraries/rhsm.py +@@ -334,6 +334,7 @@ def set_container_mode(context): + return + try: + context.call(['ln', '-s', '/etc/rhsm', '/etc/rhsm-host']) ++ context.call(['ln', '-s', '/etc/pki/entitlement', '/etc/pki/entitlement-host']) + except CalledProcessError: + raise StopActorExecutionError( + message='Cannot set the container mode for the subscription-manager.') +-- +2.41.0 + diff --git a/leapp-repository.spec b/leapp-repository.spec index 6d4d68d..0e02d6a 100644 --- a/leapp-repository.spec +++ b/leapp-repository.spec @@ -42,7 +42,7 @@ py2_byte_compile "%1" "%2"} Name: leapp-repository Version: 0.19.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Repositories for leapp License: ASL 2.0 @@ -55,6 +55,7 @@ BuildArch: noarch ### PATCHES HERE # Patch0001: filename.patch +Patch0001: 0001-RHSM-Adjust-the-switch-to-container-mode-for-new-RHS.patch %description @@ -274,6 +275,10 @@ done; # no files here %changelog +* Tue Oct 31 2023 Petr Stodulka - 0.19.0-2 +- Fix the upgrade when the release is locked by new subscription-manager +- Resolves: RHEL-12882 + * Wed Aug 23 2023 Petr Stodulka - 0.19.0-1 - Rebase to v0.19.0 - Requires leapp-framework 5.0 @@ -285,7 +290,7 @@ done; - Use new leapp CLI API which provides better report summary output - Resolves: rhbz#2215997, rhbz#2222861, rhbz#2232618 -* Mon Jul 18 2023 Petr Stodulka - 0.18.0-5 +* Tue Jul 18 2023 Petr Stodulka - 0.18.0-5 - Fix the calculation of the required free space on each partitions/volume for the upgrade transactions - Create source overlay images with dynamic sizes to optimize disk space consumption - Update GRUB2 when /boot resides on multiple devices aggregated in RAID