bug: Fix bugs with disk widget and disk encryption #423
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.
Description
A description of the change and what it does. If relevant, please provide screenshots of what results from the change:
Two issues were highlighted as a result of using either Void Linux with disk encryption, or just disk encryption on Linux in general:
Two fixes:
usage()
call in theget_disk_usage
function from failing the entire result. Now it only returns an entry with N/A results. This occurred in some distros and disk encryption setups, for example, the one for Void Linux./dev/mapper/whatever
, but the I/O harvester was using another name, the mappings would not match. As such, we now also check if a symlink exists; if it does, then we take it and work out the correct path. This also fixes the disk name being wrong.Void Linux + LUKS:
![image](https://user-images.githubusercontent.com/34804052/109086416-8a960380-76d9-11eb-8e1b-f4138a19e976.png)
PopOS with disk encryption:
![image](https://user-images.githubusercontent.com/34804052/109087027-ae0d7e00-76da-11eb-9cde-ad9c426d299b.png)
Issue
If applicable, what issue does this address?
#419
Type of change
Remove the irrelevant ones:
Test methodology
If relevant, please state how this was tested:
Furthermore, please tick which platforms this change was tested on:
If relevant, all of these platforms should be tested.
Checklist
If relevant, ensure the following have been met:
cargo test
check)cargo fmt
)Other information
Provide any other relevant information to this change: