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
29 lines
1.3 KiB
Diff
29 lines
1.3 KiB
Diff
From e43a8922e06d72212e8e2a8b51747c668147182c Mon Sep 17 00:00:00 2001
|
|
From: Michal Hecko <mhecko@redhat.com>
|
|
Date: Wed, 6 Nov 2024 22:26:01 +0100
|
|
Subject: [PATCH 25/40] fix condition on when net naming is emitted
|
|
|
|
---
|
|
.../emit_net_naming_scheme/libraries/emit_net_naming.py | 5 ++++-
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/repos/system_upgrade/el8toel9/actors/emit_net_naming_scheme/libraries/emit_net_naming.py b/repos/system_upgrade/el8toel9/actors/emit_net_naming_scheme/libraries/emit_net_naming.py
|
|
index 65abdd4d..726bb459 100644
|
|
--- a/repos/system_upgrade/el8toel9/actors/emit_net_naming_scheme/libraries/emit_net_naming.py
|
|
+++ b/repos/system_upgrade/el8toel9/actors/emit_net_naming_scheme/libraries/emit_net_naming.py
|
|
@@ -44,7 +44,10 @@ def is_net_scheme_compatible_with_current_cmdline():
|
|
|
|
|
|
def emit_msgs_to_use_net_naming_schemes():
|
|
- if get_env('LEAPP_USE_NET_NAMING_SCHEMES', '0') != '1' and version.get_target_major_version() != '8':
|
|
+ is_env_var_set = get_env('LEAPP_USE_NET_NAMING_SCHEMES', '0') == '1'
|
|
+ is_upgrade_8to9 = version.get_target_major_version() == '9'
|
|
+ is_net_naming_enabled_and_permitted = is_env_var_set and is_upgrade_8to9
|
|
+ if not is_net_naming_enabled_and_permitted:
|
|
return
|
|
|
|
# The package should be installed regardless of whether we will modify the cmdline -
|
|
--
|
|
2.47.0
|
|
|