f377dd9ccb
- Require leapp-framework 6.0+ - Update leapp-deps package to satisfy leapp-framework-dependencies 6 - Add dependency on libdb-utils - Enable upgrade for systems with LUKS bound to Clevis with TPM 2.0 token - Adjust resource limitations for leapp to be able to perform the upgrade - Cap max size of the sparse files to 1TiB for storage with large amount of free space - Check that detected Intel CPU microarchitecture is supported on target system - Fix the report when handling broken parsing of kernel cmdline - Generate proper error message instead of ModelViolationError when parsing invalid repository definition - Handle default kernel cmdline when multiple boot entries for the default kernel are defined - Migrate Ruby IRB during the upgrade - Migrate pam_userdb backend during the upgrade - Skip checking of (PKI) `directory-hash` dir to speedup the upgrade process and clean logs - Update leapp upgrade data files - Resolves: RHEL-57043
41 lines
1.7 KiB
Diff
41 lines
1.7 KiB
Diff
From 81a3297516fbbd120b0fb870de36f1a1b290dd21 Mon Sep 17 00:00:00 2001
|
|
From: Jarek Prokop <jprokop@redhat.com>
|
|
Date: Wed, 6 Nov 2024 15:21:14 +0100
|
|
Subject: [PATCH 29/40] Expand on the actor docstring for the el8->el9
|
|
rubygem-irb symlink fix.
|
|
|
|
In RHEL 10, the directory is a regular directory again.
|
|
|
|
The 2 actors are separate over creating a common solution for both.
|
|
Expand in the docstring on the reason for the el8->el9 actor to
|
|
differentiate them apart.
|
|
---
|
|
.../actors/registerrubyirbadjustment/actor.py | 11 ++++++++++-
|
|
1 file changed, 10 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/repos/system_upgrade/el8toel9/actors/registerrubyirbadjustment/actor.py b/repos/system_upgrade/el8toel9/actors/registerrubyirbadjustment/actor.py
|
|
index ac4d1e6f..a33d8831 100644
|
|
--- a/repos/system_upgrade/el8toel9/actors/registerrubyirbadjustment/actor.py
|
|
+++ b/repos/system_upgrade/el8toel9/actors/registerrubyirbadjustment/actor.py
|
|
@@ -5,7 +5,16 @@ from leapp.tags import FactsPhaseTag, IPUWorkflowTag
|
|
|
|
class RegisterRubyIRBAdjustment(Actor):
|
|
"""
|
|
- Registers a workaround which will adjust the Ruby IRB directories during the upgrade.
|
|
+ Register a workaround to allow rubygem-irb's directory -> symlink conversion.
|
|
+
|
|
+ The /usr/share/ruby/irb has been moved from a directory to a symlink
|
|
+ in RHEL 9 and this conversion was not handled on RPM level.
|
|
+ This leads to DNF reporting package file conflicts when a major upgrade
|
|
+ is attempted and rubygem-irb (or ruby-irb) is installed.
|
|
+
|
|
+ Register "handlerubyirbsymlink" script that removes the directory prior
|
|
+ to DNF upgrade and allows it to create the expected symlink in place of
|
|
+ the removed directory.
|
|
"""
|
|
|
|
name = 'register_ruby_irb_adjustment'
|
|
--
|
|
2.47.0
|
|
|