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.6: Fixes for RHEL-49670 (bootc error message) #2127

Merged
merged 4 commits into from
Sep 24, 2024

Conversation

ppisar
Copy link
Contributor

@ppisar ppisar commented Aug 28, 2024

This patch set is a backport of the following upstream commits for rhel-9.6 branch:

Upstream commit: 5c050ba
Upstream commit: 6120fe5
Upstream commit: e253558
Upstream commit: a1aa8d0
Resolves: https://issues.redhat.com/browse/RHEL-49670

…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
@pep8speaks
Copy link

pep8speaks commented Aug 28, 2024

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

There are currently no PEP 8 issues detected in this Pull Request. Cheers! 🍻

Comment last updated at 2024-08-28 15:31:59 UTC

@ppisar ppisar force-pushed the rhel-9.6-RHEL-49670 branch 3 times, most recently from 9eba026 to a4660fa Compare August 28, 2024 15:27
jmarrero and others added 3 commits August 28, 2024 17:31
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: a1aa8d0

Some people use --installroot on a read-only bootc system to install
a system into a chroot subtree. However, current bootc check did not
take into account --installroot and rejected the operation.

This patch augments the check for the installroot being different
from /.

It's pointless to check for installroot writability here because
installroot is written before this check when updating the
repositories and computing a transaction. Moving this check sooner
would not help because some directories (/opt, /) are kept read-only
even on writable bootc.

Resolves: rpm-software-management#2108
Resolves: https://issues.redhat.com/browse/RHEL-49670
@ppisar
Copy link
Contributor Author

ppisar commented Aug 28, 2024

I hope a resolved all the white-speca PEP complains. I've never seen such a picky language as Python.

@ppisar
Copy link
Contributor Author

ppisar commented Sep 5, 2024

This an amended respin of #2110. @dcantrell, can you review it?

@kontura kontura merged commit ca4c522 into rpm-software-management:rhel-9.6 Sep 24, 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
None yet
Development

Successfully merging this pull request may close these issues.

5 participants