Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rhel-9.5: Fixes for RHEL-49670 #2114

Merged
merged 3 commits into from
Jul 26, 2024

Conversation

ppisar
Copy link
Contributor

@ppisar ppisar commented Jul 24, 2024

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?

@pep8speaks
Copy link

pep8speaks commented Jul 24, 2024

Hello @ppisar! Thanks for updating this PR. We checked the lines you've touched for PEP 8 issues, and found:

Line 647:73: W292 no newline at end of file

Comment last updated at 2024-07-24 11:40:44 UTC

dcantrell and others added 3 commits July 24, 2024 13:32
…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 <[email protected]>
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
@ppisar
Copy link
Contributor Author

ppisar commented Jul 24, 2024

Dammit new lines. I will remove them.

@ppisar
Copy link
Contributor Author

ppisar commented Jul 24, 2024

I removed the new-lines.

@ppisar
Copy link
Contributor Author

ppisar commented Jul 24, 2024

FYI, CI tests are expected to fail because they run on Fedora, not on RHEL.

@dcantrell dcantrell self-requested a review July 25, 2024 14:41
@ppisar ppisar merged commit 6461b97 into rpm-software-management:rhel-9.5 Jul 26, 2024
1 of 3 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

4 participants