rhel-9.5: Fixes for RHEL-49670 #2114
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Hello @ppisar! Thanks for updating this PR. We checked the lines you've touched for PEP 8 issues, and found:
Comment last updated at 2024-07-24 11:40:44 UTC |
…anges Upstream commit: 5c050ba On ostree-based systems, users can use dnf to customize the environment but those changes will be lost at the next ostree-based image update. If you want to retain changes between ostree-updates you need to make use of rpm-ostree right now. Signed-off-by: David Cantrell <dcantrell@redhat.com> Resolves: https://issues.redhat.com/browse/RHEL-49670
Upstream commit: 6120fe5 This changes the is_container() func for _is_bootc_host() and updates the logic and message. This should detect on all ostree and bootc hosts to date that are not using bootc usroverlay or ostree admin unlock for development purposes. Resolves: https://issues.redhat.com/browse/RHEL-49670
Upstream commit: e253558 Resolves: https://issues.redhat.com/browse/RHEL-49670
|
Dammit new lines. I will remove them. |
ppisar
force-pushed
the
rhel-9.5-RHEL-49670
branch
from
8e9ac6d
to
f85cda1
Compare
|
I removed the new-lines. |
|
FYI, CI tests are expected to fail because they run on Fedora, not on RHEL. |
dcantrell
approved these changes
Jul 25, 2024
ppisar
merged commit 6461b97
into
rpm-software-management:rhel-9.5
1 of 3 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This patch set is a backport of the following upstream commits for rhel-9.5 branch:
Upstream commit: bee2554
Upstream commit: 6274a49
Upstream commit: 8e9ac6d
Resolves: https://issues.redhat.com/browse/RHEL-49670
@dcantrell, could you please review this backport?