Improve btrfs handling in custom partitioning #4812
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
…158) When removing a btrfs subvolume, do not remove its empty parents which are also subvolumes (only empty parent volumes should be removed).
Do not accept btrfs volume returned by resolve_device blivet method if we are looking for a subvolume.
|
@vojtechtrefny can you please look at the PR ? |
jkonecny12
reviewed
Jun 5, 2023
|
I've opened an issue for Blivet to fix the btrfs subvolume resolution there:storaged-project/blivet#1134 rather than with this PR patch, but I don't want to block this PR on it. |
|
/kickstart-test --testtype smoke |
VladimirSlavik
approved these changes
Jun 6, 2023
| @@ -299,6 +299,11 @@ def _parse_fstab(devicetree, chroot): | |||
| if device is None: | |||
| continue | |||
|
|
|||
| # If a btrfs volume is found but a subvolume is expected, ignore the volume. | |||
| if device.type == "btrfs volume" and "subvol=" in options: | |||
| log.debug("subvolume from %s for %s not found", options, devspec) | |||
There was a problem hiding this comment.
I don't understand this too well, so sorry if I'm wrong, but... is it not found, or skipped?
There was a problem hiding this comment.
A subvolume was not found (for example it had been removed by GUI action).
This comment was marked as duplicate.
This comment was marked as duplicate.
Sorry, something went wrong.
Conan-Kudo
approved these changes
Jun 6, 2023
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.
The patches should improve the manipulation with btrfs subvolumes in GUI Custom partitioning as reported in https://bugzilla.redhat.com/show_bug.cgi?id=2186158.
One of the patches should fix removing of btrfs subvolumes:
Original (parent subvolume /root is removed incorrectly):
https://rvykydal.fedorapeople.org/btrfs/rhbz2186158/removing_parent_subvolume.webm
Patched:
https://rvykydal.fedorapeople.org/btrfs/rhbz2186158/preserving_parent_subvolume.webm
The other one fixes displaying btrfs subvolumes in Custom partitioning:
Original:
https://bugzilla.redhat.com/show_bug.cgi?id=2186158#c6
Patched:
https://rvykydal.fedorapeople.org/btrfs/rhbz2186158/remove_btrfs_home.webm
Although the patches don't solve btrfs volume reformatting, they should allow to reuse /home subvolume by mounting it, removing and adding root subvolume and reformatting other non-btrfs partitions as in:
https://rvykydal.fedorapeople.org/btrfs/rhbz2186158/reuse_home_by_removing_and_adding_btrfs_root.webm