69 lines
3.6 KiB
Diff
69 lines
3.6 KiB
Diff
|
From da6f0248c97aed46d519d97d0f334fd7bd44f86e Mon Sep 17 00:00:00 2001
|
||
|
|
From: Michal Reznik <mreznik@redhat.com>
|
||
|
|
Date: Fri, 7 Jun 2024 10:20:35 +0200
|
||
|
|
Subject: [PATCH 77/92] Install util-linux into the target container
|
||
|
|
|
||
|
|
The util-linug RPM is not installed automatically as a dependency
|
||
|
|
when:
|
||
|
|
* upgrading 9 -> 10
|
||
|
|
* or when dnf is configured to: install_weak_deps=False
|
||
|
|
(affecting all upgrade paths)
|
||
|
|
|
||
|
|
Missing util-linux package leads to error due to missing `su` command
|
||
|
|
inside the container.
|
||
|
|
|
||
|
|
jira: https://issues.redhat.com/browse/RHEL-43978
|
||
|
|
---
|
||
|
|
.../actors/targetuserspacecreator/libraries/userspacegen.py | 2 +-
|
||
|
|
.../tests/unit_test_targetuserspacecreator.py | 2 +-
|
||
|
|
repos/system_upgrade/common/libraries/tests/test_rpms.py | 2 +-
|
||
|
|
repos/system_upgrade/el9toel10/actors/.gitkeep | 0
|
||
|
|
4 files changed, 3 insertions(+), 3 deletions(-)
|
||
|
|
delete mode 100644 repos/system_upgrade/el9toel10/actors/.gitkeep
|
||
|
|
|
||
|
|
diff --git a/repos/system_upgrade/common/actors/targetuserspacecreator/libraries/userspacegen.py b/repos/system_upgrade/common/actors/targetuserspacecreator/libraries/userspacegen.py
|
||
|
|
index 6e8214dd..4a61ccb4 100644
|
||
|
|
--- a/repos/system_upgrade/common/actors/targetuserspacecreator/libraries/userspacegen.py
|
||
|
|
+++ b/repos/system_upgrade/common/actors/targetuserspacecreator/libraries/userspacegen.py
|
||
|
|
@@ -89,7 +89,7 @@ class _InputData(object):
|
||
|
|
It doesn't consume TargetRepositories, which are consumed in the
|
||
|
|
own function.
|
||
|
|
"""
|
||
|
|
- self.packages = {'dnf', 'dnf-command(config-manager)'}
|
||
|
|
+ self.packages = {'dnf', 'dnf-command(config-manager)', 'util-linux'}
|
||
|
|
self.files = []
|
||
|
|
_cftuples = set()
|
||
|
|
|
||
|
|
diff --git a/repos/system_upgrade/common/actors/targetuserspacecreator/tests/unit_test_targetuserspacecreator.py b/repos/system_upgrade/common/actors/targetuserspacecreator/tests/unit_test_targetuserspacecreator.py
|
||
|
|
index 19b760a1..826ae06d 100644
|
||
|
|
--- a/repos/system_upgrade/common/actors/targetuserspacecreator/tests/unit_test_targetuserspacecreator.py
|
||
|
|
+++ b/repos/system_upgrade/common/actors/targetuserspacecreator/tests/unit_test_targetuserspacecreator.py
|
||
|
|
@@ -1001,7 +1001,7 @@ def test_consume_data(monkeypatch, raised, no_rhsm, testdata):
|
||
|
|
# do not write never into testdata inside the test !!
|
||
|
|
xfs = testdata.xfs
|
||
|
|
custom_repofiles = testdata.custom_repofiles
|
||
|
|
- _exp_pkgs = {'dnf', 'dnf-command(config-manager)'}
|
||
|
|
+ _exp_pkgs = {'dnf', 'dnf-command(config-manager)', 'util-linux'}
|
||
|
|
_exp_files = []
|
||
|
|
|
||
|
|
def _get_pkgs(msg):
|
||
|
|
diff --git a/repos/system_upgrade/common/libraries/tests/test_rpms.py b/repos/system_upgrade/common/libraries/tests/test_rpms.py
|
||
|
|
index 955ab05c..a527407d 100644
|
||
|
|
--- a/repos/system_upgrade/common/libraries/tests/test_rpms.py
|
||
|
|
+++ b/repos/system_upgrade/common/libraries/tests/test_rpms.py
|
||
|
|
@@ -61,7 +61,7 @@ def test_get_leapp_packages(major_version, component, result, monkeypatch):
|
||
|
|
r"component nosuchcomponent is unknown, available choices are \['cockpit', 'framework', 'repository', 'tools']")
|
||
|
|
),
|
||
|
|
('nosuchversion', "framework",
|
||
|
|
- (ValueError, r"major_version nosuchversion is unknown, available choices are \['7', '8']")),
|
||
|
|
+ (ValueError, r"major_version nosuchversion is unknown, available choices are \['7', '8', '9']")),
|
||
|
|
('nosuchversion', False,
|
||
|
|
(ValueError, r"At least one component must be specified when calling this function,"
|
||
|
|
r" available choices are \['cockpit', 'framework', 'repository', 'tools']")),
|
||
|
|
diff --git a/repos/system_upgrade/el9toel10/actors/.gitkeep b/repos/system_upgrade/el9toel10/actors/.gitkeep
|
||
|
|
deleted file mode 100644
|
||
|
|
index e69de29b..00000000
|
||
|
|
--
|
||
|
|
2.42.0
|
||
|
|
|