7074ce276e
- Fix handling of LVM and Multipath during the upgrade - Fix remediation command for making symlinks in root directory relative - Remove RPM GPG keys of the source distribution when upgrading and converting the system - Replace distro specific packages during upgrade and conversion - Improve error message when scanning invalid SSHD configuration - Update the leapp data files - Minor changes in logs and reports - Resolves: RHEL-14712, RHEL-30447, RHEL-19247, RHEL-127066, RHEL-124923, RHEL-119516
42 lines
1.8 KiB
Diff
42 lines
1.8 KiB
Diff
From 1ec6ea8f8081c6895ed42696df9de51343e6c8ba Mon Sep 17 00:00:00 2001
|
|
From: Matej Matuska <mmatuska@redhat.com>
|
|
Date: Thu, 21 Aug 2025 19:28:06 +0200
|
|
Subject: [PATCH 095/111] lib/dnfplugin: Remove RHEL 7 bind mount code path
|
|
|
|
---
|
|
repos/system_upgrade/common/libraries/dnfplugin.py | 11 +++--------
|
|
1 file changed, 3 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/repos/system_upgrade/common/libraries/dnfplugin.py b/repos/system_upgrade/common/libraries/dnfplugin.py
|
|
index 1af52dc5..7e1fd497 100644
|
|
--- a/repos/system_upgrade/common/libraries/dnfplugin.py
|
|
+++ b/repos/system_upgrade/common/libraries/dnfplugin.py
|
|
@@ -19,7 +19,6 @@ _DEDICATED_URL = 'https://access.redhat.com/solutions/7011704'
|
|
|
|
class _DnfPluginPathStr(str):
|
|
_PATHS = {
|
|
- "8": os.path.join('/lib/python3.6/site-packages/dnf-plugins', DNF_PLUGIN_NAME),
|
|
"9": os.path.join('/lib/python3.9/site-packages/dnf-plugins', DNF_PLUGIN_NAME),
|
|
"10": os.path.join('/lib/python3.12/site-packages/dnf-plugins', DNF_PLUGIN_NAME),
|
|
}
|
|
@@ -405,13 +404,9 @@ def perform_transaction_install(target_userspace_info, storage_info, used_repos,
|
|
'/run/udev:/installroot/run/udev',
|
|
]
|
|
|
|
- if get_target_major_version() == '8':
|
|
- bind_mounts.append('/sys:/installroot/sys')
|
|
- else:
|
|
- # the target major version is RHEL 9+
|
|
- # we are bindmounting host's "/sys" to the intermediate "/hostsys"
|
|
- # in the upgrade initramdisk to avoid cgroups tree layout clash
|
|
- bind_mounts.append('/hostsys:/installroot/sys')
|
|
+ # we are bindmounting host's "/sys" to the intermediate "/hostsys"
|
|
+ # in the upgrade initramdisk to avoid cgroups tree layout clash
|
|
+ bind_mounts.append('/hostsys:/installroot/sys')
|
|
|
|
already_mounted = {entry.split(':')[0] for entry in bind_mounts}
|
|
for entry in storage_info.fstab:
|
|
--
|
|
2.52.0
|
|
|