storage: fix use of ptable parameter when calling reformat #2155
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
When reformatting a disk using the following call: > manipulator.reformat(disk, ptable="something") The ptable parameter would only appear to be honored if the disk did not contain any partition. This happened because the reformat() function sets the ptable of the disk first and then starts removing partitions using delete_partition() in a loop. However, delete_partition() has a mechanism to reset the partition table to None when it is invoked on the last partition of a disk. Therefore, the disk ended up with None as the partition table (ignoring the ptable value) if the disk contained any partition. Fixed by moving the assignment of disk.ptable after removing partitions. Arguably, it is a mistake to change the partition table value before removing the partitions anyway. Signed-off-by: Olivier Gayot <[email protected]>
dbungert
approved these changes
Jan 30, 2025
ogayot
commented
Jan 30, 2025
| @@ -270,10 +270,10 @@ def clear(self, obj, wipe=None): | |||
|
|
|||
| def reformat(self, disk, ptable=None, wipe=None): | |||
There was a problem hiding this comment.
Note that using the default value for ptable will still have a different behavior on disks that have partitions vs on disks that have no partition.
For disks with partitions, disk.ptable will be reset to None (because model.remove_partition will do that)
For disks without partition, disk.ptable will be left untouched.
This feels inconsistent.
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.
When reformatting a disk using the following call:
The ptable parameter would only appear to be honored if the disk did not contain any partition. This happened because the
reformat()function sets the ptable of the disk first and then starts removing partitions usingdelete_partition()in a loop.However,
delete_partition()has a mechanism to reset the partition table toNonewhen it is invoked on the last partition of a disk.Therefore, the disk ended up with
Noneas the partition table (ignoring the ptable value) if the disk contained any partition.Fixed by moving the assignment of
disk.ptableafter removing partitions. Arguably, it is a mistake to change the partition table value before removing the partitions anyway.