Add disk2 status and update volume retrieval method#23
Open
kryptonik-os wants to merge 2 commits into
Open
Conversation
Add free space for a secondary storage. The volume displays the Sys-Audio volume if it is not managed by dom0.
marmarek
requested changes
Jan 5, 2026
marmarek
left a comment
marmarek
left a comment
Member
There was a problem hiding this comment.
This script already uses qubesadmin module, don't use subprocess for calling qvm-* tools - it's quite expensive, especially for things called every few seconds.
See status_net(). You may want to use run_with_args() method instead of run - it's a bit faster.
And see also comment next to the status_net() call - which you conveniently removed - don't... But you do validate the output, so it's probably okay here. But check if sys-audio is running first, to not start it unintentionally.
Author
|
ok, I'll put the comment back as it was originally for |
Member
Yes. Or even better, take global
Sounds ok.
Yes, at least qubes-i3status should not start it on its own. |
I modify "status_volume()" and "status_volume_dom0()". For the Disks, instead of displaying "disk" en "disk2", it displays the name of pools
Author
|
As you wanted, I modified the script for the volume: Now,
I restore comment next to the status_net() . For the disks, instead of displaying "disk" and "disk2". The names of the pools are displayed directly, I found it more readable because now, it displays the same names as in the Qubes Disk Space Monitor. |
This was referenced Mar 2, 2026
OpenQA test summaryComplete test suite and dependencies: https://openqa.qubes-os.org/tests/overview?distri=qubesos&version=4.3&build=2026060617-devel&flavor=pull-requests Test run included the following:
New failures, excluding unstableCompared to: https://openqa.qubes-os.org/tests/overview?distri=qubesos&version=4.3&build=2026050504-devel&flavor=update
Failed tests22 failures
Fixed failuresCompared to: https://openqa.qubes-os.org/tests/176874#dependencies 22 fixed
Unstable testsDetails
Performance TestsPerformance degradation:20 performance degradations
Remaining performance tests:91 tests
|
This was referenced Mar 2, 2026
Closed
ben-grande
suggested changes
Mar 4, 2026
ben-grande
left a comment
ben-grande
left a comment
Contributor
There was a problem hiding this comment.
I like what has been done and I don't want to discourage you with the amount of comments I made.
| usage = int(pool.usage) | ||
| free = size - usage | ||
|
|
||
| # Détermination of free size |
| return json_output("volume", f"{vm} : {volume_pct} %", color) | ||
|
|
||
|
|
||
| def status_volume_dom0(): |
Contributor
There was a problem hiding this comment.
No dom0, might be a guivm that is also an audiovm.
Author
There was a problem hiding this comment.
I would like to known what is the problem with guivm in it.
I just configure the audiovm and do nothing with the guivm in the script :/
|
|
||
| if all_off: | ||
| return json_output("volume", "Volume: mute") | ||
| return json_output("volume", "dom0: mute") |
Contributor
There was a problem hiding this comment.
|
|
||
| def status_volume(): | ||
|
|
||
| # find default audio-vm |
Contributor
There was a problem hiding this comment.
We don't refer to AudioVM as audio-vm.
| def status_volume(): | ||
|
|
||
| # find default audio-vm | ||
| vm = getattr(app, "default_audiovm", None) |
Contributor
There was a problem hiding this comment.
I think this information should either be cached in qubes.api.internal.SystemInfoCache or you should query it once and handle events that change this data. See other repos for dispatcher.add_handler.
| else: | ||
| disk2_free = f"{free} Bytes" | ||
|
|
||
| return json_output("disk2", f"{pool_name}: {disk2_free}") |
Contributor
There was a problem hiding this comment.
I don't think the entry can remain disk2 or return the output right know. It is in a loop, meaning it will only get the result of the first pool. If all are disk2, it will be overwitten? I don't think two entries can have the same identifier. Add diskN, where N increases per iteration.
|
|
||
|
|
||
| def status_disk2(): | ||
| default_pool_name = app.property_get_default("default_pool_private") |
Contributor
There was a problem hiding this comment.
|
|
||
| def status_disk2(): | ||
| default_pool_name = app.property_get_default("default_pool_private") | ||
| pools = app.pools |
Contributor
There was a problem hiding this comment.
| continue | ||
|
|
||
| # Filter only pools with a driver of 'lvm_thin' | ||
| if getattr(pool, "driver", None) != "lvm_thin": |
Contributor
There was a problem hiding this comment.
Why? What about people using other file systems?
Author
There was a problem hiding this comment.
you're right, i just think for myself because i just use lvm lol
| return entry | ||
|
|
||
|
|
||
|
|
Contributor
There was a problem hiding this comment.
Remove this extra line please.
Author
|
Thank you for checking my PR, and for your recommendations. |
This was referenced Mar 15, 2026
This was referenced May 6, 2026
Merged
This was referenced May 15, 2026
This was referenced May 25, 2026
This was referenced Jun 2, 2026
tests: do not fail dispvm+thunderbird test early if TB is not installed
QubesOS/qubes-core-admin#817
Merged
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Add free space for a secondary storage.
The volume displays the Sys-Audio volume if it is not managed by dom0.
I test it on 4.2 and 4.3rc4